Ticket #4310 - Timeline: Remove custom Emoji picker from post form.

modules/boonex/russian/data/langs/bx_timeline/ru.xml

@@ -277,8 +277,6 @@
 
     <string name="_bx_timeline_menu_title_post_attachments"><![CDATA[Форма - Прикрепления]]></string>
     <string name="_bx_timeline_menu_set_title_post_attachments"><![CDATA[Форма - Прикрепления]]></string>
-    <string name="_bx_timeline_menu_item_title_system_add_emoji"><![CDATA[Добавить Emoji]]></string>
-    <string name="_bx_timeline_menu_item_title_add_emoji"><![CDATA[Добавить Emoji]]></string>
     <string name="_bx_timeline_menu_item_title_system_add_link"><![CDATA[Добавить ссылку]]></string>
     <string name="_bx_timeline_menu_item_title_add_link"><![CDATA[Добавить ссылку]]></string>
     <string name="_bx_timeline_menu_item_title_system_add_photo_simple"><![CDATA[Добавить фото (Обычная загрузка)]]></string>

modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -589,15 +589,6 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
         return in_array($iEventId, $this->_aHotList);
     }
 
-    public function isEmoji()
-    {
-        $oMenu = BxDolMenu::getObjectInstance($this->getObject('menu_post_attachments'));
-        if(!$oMenu)
-            return false;
-
-        return $oMenu->isMenuItem('add-emoji');
-    }
-
     public function isEditorToolbar()
     {
     	return $this->_bEditorToolbar;

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -71,9 +71,6 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
                 break;
 
             case 'post':
-                if($this->_oConfig->isEmoji())
-                    $aCss[] = BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'emoji/css/|emoji.css';
-
                 $aCss[] = 'post.css';
                 break;
         }
@@ -144,7 +141,6 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
         }
 
         return $this->getJsCode('post', array_merge(array(
-            'bEmoji' => $this->_oConfig->isEmoji(),
             'bAutoAttach' => $this->_oConfig->isEditorAutoAttach(),
             'iLimitAttachLinks' => $this->_oConfig->getLimitAttachLinks(),
             'sLimitAttachLinksErr' => bx_js_string(_t('_bx_timeline_txt_err_attach_links')),

modules/boonex/timeline/install/langs/en.xml

@@ -289,8 +289,6 @@
 
     <string name="_bx_timeline_menu_title_post_attachments"><![CDATA[Form Attachments]]></string>
     <string name="_bx_timeline_menu_set_title_post_attachments"><![CDATA[Form Attachments]]></string>
-    <string name="_bx_timeline_menu_item_title_system_add_emoji"><![CDATA[Add Emoji]]></string>
-    <string name="_bx_timeline_menu_item_title_add_emoji"><![CDATA[Add Emoji]]></string>
     <string name="_bx_timeline_menu_item_title_system_add_link"><![CDATA[Add Link]]></string>
     <string name="_bx_timeline_menu_item_title_add_link"><![CDATA[Add Link]]></string>
     <string name="_bx_timeline_menu_item_title_system_add_photo_simple"><![CDATA[Add Photo (Simple)]]></string>

modules/boonex/timeline/install/sql/enable.sql

@@ -242,7 +242,6 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 ('bx_timeline_menu_post_attachments', 'bx_timeline', '_bx_timeline_menu_set_title_post_attachments', 0);
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) VALUES 
-('bx_timeline_menu_post_attachments', 'bx_timeline', 'add-emoji', '_bx_timeline_menu_item_title_system_add_emoji', '_bx_timeline_menu_item_title_add_emoji', 'javascript:void(0)', '', '_self', 'far smile', '', '', 2147483647, 0, 0, 1, 0),
 ('bx_timeline_menu_post_attachments', 'bx_timeline', 'add-link', '_bx_timeline_menu_item_title_system_add_link', '_bx_timeline_menu_item_title_add_link', 'javascript:void(0)', 'javascript:{js_object}.showAttachLink(this, {content_id});', '_self', 'link', '', '', 2147483647, 1, 0, 1, 1),
 ('bx_timeline_menu_post_attachments', 'bx_timeline', 'add-photo-simple', '_bx_timeline_menu_item_title_system_add_photo_simple', '_bx_timeline_menu_item_title_add_photo', 'javascript:void(0)', 'javascript:{js_object_add_photo_simple}.showUploaderForm();', '_self', 'camera', '', '', 2147483647, 0, 0, 1, 2),
 ('bx_timeline_menu_post_attachments', 'bx_timeline', 'add-photo-html5', '_bx_timeline_menu_item_title_system_add_photo_html5', '_bx_timeline_menu_item_title_add_photo', 'javascript:void(0)', 'javascript:{js_object_add_photo_html5}.showUploaderForm();', '_self', 'camera', '', '', 2147483647, 1, 0, 1, 3),

modules/boonex/timeline/js/post.js

@@ -15,7 +15,6 @@ function BxTimelinePost(oOptions) {
     this._iOwnerId = oOptions.iOwnerId == undefined ? 0 : parseInt(oOptions.iOwnerId);
     this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'slide' : oOptions.sAnimationEffect;
     this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._bEmoji = oOptions.bEmoji == undefined ? false : oOptions.bEmoji;
     this._bAutoAttach = oOptions.bAutoAttach == undefined ? false : oOptions.bAutoAttach;
     this._sAutoUploader = oOptions.sAutoUploader == undefined ? '' : oOptions.sAutoUploader;
     this._sAutoUploaderId = oOptions.sAutoUploaderId == undefined ? '' : oOptions.sAutoUploaderId;
@@ -30,23 +29,6 @@ function BxTimelinePost(oOptions) {
     if (typeof window.glOnInitEditor === 'undefined')
         window.glOnInitEditor = [];
 
-    if(this._bEmoji)
-        window.glOnInitEditor.push(function (sEditorSelector) {
-            var sBaseUrl = sUrlRoot + 'plugins_public/emoji/js/';
-            if ('undefined' === typeof(EmojiPicker)) {
-                bx_get_scripts([
-                    sBaseUrl + 'util.js', 
-                    sBaseUrl + 'config.js',
-                    sBaseUrl + 'emoji-picker.js', 
-                    sBaseUrl + 'jquery.emojiarea.js'
-                ], function() {
-                    $this.initEmoji(sEditorSelector)
-                });
-            }
-            else
-                $this.initEmoji(sEditorSelector);
-        });
-
     $(document).ready(function () {
         var oPost = $($this.sIdPost + ' form');
         if(!oPost || oPost.length == 0)
@@ -65,20 +47,6 @@ function BxTimelinePost(oOptions) {
 
 BxTimelinePost.prototype = new BxTimelineMain();
 
-BxTimelinePost.prototype.initEmoji = function(sEditorSelector)
-{
-    if(!this._bEmoji)
-        return;
-
-    var oLink = $(sEditorSelector).parents('form:first').find('a.add-emoji');
-
-    var oEmojiConf = {
-        emojiable_selector: bx_editor_get_htmleditable(sEditorSelector), 
-        menu_icon: oLink  /* emoji popup menu icon */
-    };
-    new EmojiPicker(oEmojiConf ).discover();  /* call init emoji function */
-};
-
 BxTimelinePost.prototype.initFormPost = function(sFormId)
 {
     var $this = this;

modules/boonex/timeline/template/css/post.css

@@ -66,12 +66,7 @@ div.bx-tl-ali-actions .bx-btn {
     float: none;
 }
 
-/*--- Add Emoji Styles ---*/
-.bx-menu-btn.add-emoji {
-	position: relative;
-}
-
 /*--- Froala Styles ---*/
 .bx-form-input-wrapper-textarea .fr-toolbar {
-	z-index: 0;
+    z-index: 0;
 }