scratch – Diff between revs 58 and 125

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 58 Rev 125
Line 901... Line 901...
901 fr: { 901 fr: {
902 emoji: 'Ajouter un emoji' 902 emoji: 'Ajouter un emoji'
903 }, 903 },
904 zh_cn: { 904 zh_cn: {
905 emoji: '添加表情' 905 emoji: '添加表情'
-   906 },
-   907 ja: {
-   908 emoji: '絵文字の挿入'
906 } 909 }
907 }, 910 },
908 // jshint camelcase:true 911 // jshint camelcase:true
909 plugins: { 912 plugins: {
910 emoji: { 913 emoji: {
911 init: function (trumbowyg) { 914 init: function (trumbowyg) {
912 trumbowyg.o.plugins.emoji = $.extend(true, {}, defaultOptions, trumbowyg.o.plugins.emoji || {}); 915 trumbowyg.o.plugins.emoji = trumbowyg.o.plugins.emoji || defaultOptions;
913 var emojiBtnDef = { 916 var emojiBtnDef = {
914 dropdown: buildDropdown(trumbowyg) 917 dropdown: buildDropdown(trumbowyg)
915 }; 918 };
916 trumbowyg.addBtnDef('emoji', emojiBtnDef); 919 trumbowyg.addBtnDef('emoji', emojiBtnDef);
917 } 920 }
Line 921... Line 924...
921   924  
922 function buildDropdown(trumbowyg) { 925 function buildDropdown(trumbowyg) {
Line 923... Line 926...
923 var dropdown = []; 926 var dropdown = [];
-   927  
-   928 $.each(trumbowyg.o.plugins.emoji.emojiList, function (i, emoji) {
-   929 if ($.isArray(emoji)) { // Custom emoji behaviour
-   930 var emojiCode = emoji[0],
-   931 emojiUrl = emoji[1],
-   932 emojiHtml = '<img src="' + emojiUrl + '" alt="' + emojiCode + '">',
-   933 btnDef = {
-   934 hasIcon: false,
-   935 param: emojiHtml,
-   936 fn: function () {
-   937 trumbowyg.execCmd('insertImage', emojiUrl, false, true);
-   938 return true;
-   939 }
-   940 };
-   941 trumbowyg.addBtnDef(emojiHtml, btnDef);
924   942 dropdown.push(emojiHtml);
925 $.each(trumbowyg.o.plugins.emoji.emojiList, function (i, emoji) { 943 } else { // Default behaviour
926 var btn = emoji, 944 var btn = emoji,
927 btnDef = { 945 btnDef = {
928 param: emoji, 946 param: emoji,
929 fn: function () { 947 fn: function () {
930 trumbowyg.execCmd('insertText', emoji); 948 trumbowyg.execCmd('insertText', emoji);
931 return true; 949 return true;
932 } 950 }
933 }; 951 };
-   952 trumbowyg.addBtnDef(btn, btnDef);
934 trumbowyg.addBtnDef(btn, btnDef); 953 dropdown.push(btn);
Line 935... Line 954...
935 dropdown.push(btn); 954 }
936 }); 955 });
937   956