Merge pull request #24 from fabrixxm/master

[friendica.git] / view / jot-header.tpl

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index cdef9ef832a7d5082a1aeca0029b1d163f399338..352c48647e04a0032609239b3a36a1d1b6210261 100644 (file)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -113,42 +113,10 @@ function enableOnUser(){
 
        $(document).ready(function() {
                
-<<<<<<< HEAD
                /* enable tinymce on focus and click */
                $("#profile-jot-text").focus(enableOnUser);
                $("#profile-jot-text").click(enableOnUser);
-=======
-               /* enable tinymce on focus */
-               $("#profile-jot-text").focus(function(){
-                       if (editor) return;
-                       $(this).val("");
-                       initEditor();
-               });
-
-               $("#jot-title").mouseout(function() {
-                       $("#jot-title").hide();
-                       var ttl = $("#jot-title").val();
-                       $('#jot-title-display').html(ttl);
-                       if(ttl.length) {
-                               $("#jot-title-display").show();
-                       }
-                       else {
-                               $("#jot-title-desc").show();
-                       }
-               });
 
-               $("#jot-title-display").hover(function() {
-                       $("#jot-title-display").hide();
-                       $("#jot-title").show();
-                       $("#jot-title").focus();
-               });             
-
-               $("#jot-title-desc").click(function() {
-                       $("#jot-title-desc").hide();
-                       $("#jot-title").show();
-                       $("#jot-title").focus();
-               });             
->>>>>>> friendica/master
        
                var uploader = new window.AjaxUpload(
                        'wall-image-upload',