]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' into issue/#3062
authorHypolite Petovan <mrpetovan@gmail.com>
Fri, 27 Jan 2017 20:30:21 +0000 (15:30 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Fri, 27 Jan 2017 20:30:21 +0000 (15:30 -0500)
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
# view/theme/frost-mobile/js/theme.js
# view/theme/frost/js/theme.js

1  2 
boot.php
js/main.js
mod/photos.php
view/templates/head.tpl
view/theme/frost-mobile/js/theme.js
view/theme/frost/js/theme.js

diff --cc boot.php
Simple merge
diff --cc js/main.js
Simple merge
diff --cc mod/photos.php
Simple merge
Simple merge
index 477bd44c030fbd7e5988369ce152a5a0d862d21c,a17dc1b2a4415bd61fea5a2de712c998317f4cad..abb2ed7c426e288dcb732b16b72fbc2c99c09b29
@@@ -25,10 -27,10 +25,10 @@@ $(document).ready(function() 
  
  
  
 -      if(typeof window.AjaxUpload != "undefined") {
 +      if (typeof window.AjaxUpload != "undefined") {
                var uploader = new window.AjaxUpload(
                        window.imageUploadButton,
-                       { action: 'wall_upload/'+window.nickname+'?nomce=1',
+                       { action: 'wall_upload/' + window.nickname,
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
                        }
                );
  
 -              if($('#wall-file-upload').length) {
 +              if ($('#wall-file-upload').length) {
                        var file_uploader = new window.AjaxUpload(
                                'wall-file-upload',
-                               { action: 'wall_attach/'+window.nickname+'?nomce=1',
+                               { action: 'wall_attach/' + window.nickname,
                                        name: 'userfile',
                                        onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                        onComplete: function(file,response) {
@@@ -216,44 -227,39 +216,33 @@@ function initCrop() 
  
  
  function showEvent(eventid) {
 -/*    $.get(
 -              baseurl + window.eventModuleUrl + '/?id=' + eventid,
 -              function(data){
 -                      $.colorbox({html:data});
 -              }
 -      );*/
  }
  
  /*
-  * TinyMCE/Editor
+  * Editor
   */
- var editor=false;
+ var editor = false;
  var textlen = 0;
- var plaintext = 'none';//window.editSelect;
- //var ispublic = window.isPublic;
- function initEditor(cb) {
-       if (editor==false) {
-               if (plaintext == 'none') {
-                       $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-                       $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-                       editor = true;
-                       $("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
-                               var parent = $("#profile-jot-acl-wrapper").parent();
-                               if (parent.css('display') == 'none') {
-                                       parent.show();
-                               } else {
-                                       parent.hide();
-                               }
  
-                               return false;
-                       });
-                       $(".jothidden").show();
-                       if (typeof cb!="undefined") {
-                               cb();
+ function initEditor(callback){
+       if (editor == false) {
+               $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+               $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+               $("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
+                       var parent = $("#profile-jot-acl-wrapper").parent();
+                       if (parent.css('display') == 'none') {
+                               parent.show();
+                       } else {
+                               parent.hide();
                        }
-                       return;
-               }
-       } else {
-               if (typeof cb!="undefined") cb();
+                       return false;
+               });
+               $(".jothidden").show();
+               editor = true;
+       }
+       if (typeof callback != "undefined") {
+               callback();
        }
  }
  
@@@ -424,9 -511,21 +411,9 @@@ function qCommentInsert(obj,id) 
        $(obj).val("");
  }
  
- function insertFormatting(BBcode,id) {
 -/*function showHideCommentBox(id) {
 -      if( $('#comment-edit-form-' + id).is(':visible')) {
 -              $('#comment-edit-form-' + id).hide();
 -      }
 -      else {
 -              $('#comment-edit-form-' + id).show();
 -      }
 -}*/
 -
 -
 -function insertFormatting(comment,BBcode,id) {
 -
++function insertFormatting(BBcode, id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
 -      if(tmpStr == comment) {
 -              tmpStr = "";
 +      if (tmpStr == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
index a4a975880333d2710b1f0bbbba09039e999f0d47,44dc700aba3abb78ea99fb623e23582953b6ba60..52e181a6226f76cb62fe2b256bb1561e9d259c63
@@@ -12,7 -12,12 +12,7 @@@ $(document).ready(function() 
                '#system-menu-list-closing': false
        };
  
-       /* enable tinymce on focus and click */
 -/*    $.ajaxSetup({
 -        cache: false
 -    });*/
 -
 -
+       /* enable editor on focus and click */
        $("#profile-jot-text").focus(enableOnUser);
        $("#profile-jot-text").click(enableOnUser);