From 29754111397cd36667eb19fc7bd9e80eb9a2aa79 Mon Sep 17 00:00:00 2001 From: Daniel Thies Date: Thu, 27 Aug 2015 12:15:16 -0500 Subject: [PATCH] MDL-51228 editor_atto: Apply style in plugins if selection is collapsed --- .../moodle-atto_backcolor-button-debug.js | 1 + .../moodle-atto_backcolor-button-min.js | 2 +- .../moodle-atto_backcolor-button.js | 1 + lib/editor/atto/plugins/backcolor/yui/src/button/js/button.js | 1 + .../moodle-atto_fontcolor-button-debug.js | 1 + .../moodle-atto_fontcolor-button-min.js | 2 +- .../moodle-atto_fontcolor-button.js | 1 + lib/editor/atto/plugins/fontcolor/yui/src/button/js/button.js | 1 + .../moodle-atto_noautolink-button-debug.js | 1 + .../moodle-atto_noautolink-button-min.js | 2 +- .../moodle-atto_noautolink-button.js | 1 + lib/editor/atto/plugins/noautolink/yui/src/button/js/button.js | 1 + 12 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button-debug.js b/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button-debug.js index 971d480d133..760c8a13f1d 100644 --- a/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button-debug.js +++ b/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button-debug.js @@ -71,6 +71,7 @@ Y.namespace('M.atto_backcolor').Button = Y.Base.create('button', Y.M.editor_atto icon: 'e/text_highlight', overlayWidth: '4', globalItemConfig: { + inlineFormat: true, callback: this._changeStyle }, items: items diff --git a/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button-min.js b/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button-min.js index 16a998fe4ee..9b3b4fdf082 100644 --- a/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button-min.js +++ b/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_backcolor-button",function(e,t){var n=[{name:"white",color:"#FFFFFF"},{name:"red",color:"#EF4540"},{name:"yellow",color:"#FFCF35"},{name:"green",color:"#98CA3E"},{name:"blue",color:"#7D9FD3"},{name:"black",color:"#333333"}];e.namespace("M.atto_backcolor").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){var t=[];e.Array.each(n,function(e){t.push({text:'
',callbackArgs:e.color})}),this.addToolbarMenu({icon:"e/text_highlight",overlayWidth:"4",globalItemConfig:{callback:this._changeStyle},items:t})},_changeStyle:function(e,t){this.get("host").formatSelectionInlineStyle({backgroundColor:t})}})},"@VERSION@"); +YUI.add("moodle-atto_backcolor-button",function(e,t){var n=[{name:"white",color:"#FFFFFF"},{name:"red",color:"#EF4540"},{name:"yellow",color:"#FFCF35"},{name:"green",color:"#98CA3E"},{name:"blue",color:"#7D9FD3"},{name:"black",color:"#333333"}];e.namespace("M.atto_backcolor").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){var t=[];e.Array.each(n,function(e){t.push({text:'
',callbackArgs:e.color})}),this.addToolbarMenu({icon:"e/text_highlight",overlayWidth:"4",globalItemConfig:{inlineFormat:!0,callback:this._changeStyle},items:t})},_changeStyle:function(e,t){this.get("host").formatSelectionInlineStyle({backgroundColor:t})}})},"@VERSION@"); diff --git a/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button.js b/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button.js index 971d480d133..760c8a13f1d 100644 --- a/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button.js +++ b/lib/editor/atto/plugins/backcolor/yui/build/moodle-atto_backcolor-button/moodle-atto_backcolor-button.js @@ -71,6 +71,7 @@ Y.namespace('M.atto_backcolor').Button = Y.Base.create('button', Y.M.editor_atto icon: 'e/text_highlight', overlayWidth: '4', globalItemConfig: { + inlineFormat: true, callback: this._changeStyle }, items: items diff --git a/lib/editor/atto/plugins/backcolor/yui/src/button/js/button.js b/lib/editor/atto/plugins/backcolor/yui/src/button/js/button.js index fdf92b85d5a..653cb1c06d6 100644 --- a/lib/editor/atto/plugins/backcolor/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/backcolor/yui/src/button/js/button.js @@ -69,6 +69,7 @@ Y.namespace('M.atto_backcolor').Button = Y.Base.create('button', Y.M.editor_atto icon: 'e/text_highlight', overlayWidth: '4', globalItemConfig: { + inlineFormat: true, callback: this._changeStyle }, items: items diff --git a/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button-debug.js b/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button-debug.js index 9c7b078020f..52449edddca 100644 --- a/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button-debug.js +++ b/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button-debug.js @@ -73,6 +73,7 @@ Y.namespace('M.atto_fontcolor').Button = Y.Base.create('button', Y.M.editor_atto overlayWidth: '4', menuColor: '#333333', globalItemConfig: { + inlineFormat: true, callback: this._changeStyle }, items: items diff --git a/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button-min.js b/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button-min.js index 9eb70b3afbb..b63e60a9c1f 100644 --- a/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button-min.js +++ b/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_fontcolor-button",function(e,t){var n=[{name:"white",color:"#FFFFFF"},{name:"red",color:"#EF4540"},{name:"yellow",color:"#FFCF35"},{name:"green",color:"#98CA3E"},{name:"blue",color:"#7D9FD3"},{name:"black",color:"#333333"}];e.namespace("M.atto_fontcolor").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){var t=[];e.Array.each(n,function(e){t.push({text:'
',callbackArgs:e.color,callback:this._changeStyle})}),this.addToolbarMenu({icon:"e/text_color",overlayWidth:"4",menuColor:"#333333",globalItemConfig:{callback:this._changeStyle},items:t})},_changeStyle:function(e,t){this.get("host").formatSelectionInlineStyle({color:t})}})},"@VERSION@"); +YUI.add("moodle-atto_fontcolor-button",function(e,t){var n=[{name:"white",color:"#FFFFFF"},{name:"red",color:"#EF4540"},{name:"yellow",color:"#FFCF35"},{name:"green",color:"#98CA3E"},{name:"blue",color:"#7D9FD3"},{name:"black",color:"#333333"}];e.namespace("M.atto_fontcolor").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){var t=[];e.Array.each(n,function(e){t.push({text:'
',callbackArgs:e.color,callback:this._changeStyle})}),this.addToolbarMenu({icon:"e/text_color",overlayWidth:"4",menuColor:"#333333",globalItemConfig:{inlineFormat:!0,callback:this._changeStyle},items:t})},_changeStyle:function(e,t){this.get("host").formatSelectionInlineStyle({color:t})}})},"@VERSION@"); diff --git a/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button.js b/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button.js index 9c7b078020f..52449edddca 100644 --- a/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button.js +++ b/lib/editor/atto/plugins/fontcolor/yui/build/moodle-atto_fontcolor-button/moodle-atto_fontcolor-button.js @@ -73,6 +73,7 @@ Y.namespace('M.atto_fontcolor').Button = Y.Base.create('button', Y.M.editor_atto overlayWidth: '4', menuColor: '#333333', globalItemConfig: { + inlineFormat: true, callback: this._changeStyle }, items: items diff --git a/lib/editor/atto/plugins/fontcolor/yui/src/button/js/button.js b/lib/editor/atto/plugins/fontcolor/yui/src/button/js/button.js index f6aed2259a4..789933201b4 100644 --- a/lib/editor/atto/plugins/fontcolor/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/fontcolor/yui/src/button/js/button.js @@ -71,6 +71,7 @@ Y.namespace('M.atto_fontcolor').Button = Y.Base.create('button', Y.M.editor_atto overlayWidth: '4', menuColor: '#333333', globalItemConfig: { + inlineFormat: true, callback: this._changeStyle }, items: items diff --git a/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button-debug.js b/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button-debug.js index 43a117105b4..d1fbd24168a 100644 --- a/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button-debug.js +++ b/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button-debug.js @@ -38,6 +38,7 @@ Y.namespace('M.atto_noautolink').Button = Y.Base.create('button', Y.M.editor_att this.addButton({ icon: 'e/prevent_autolink', callback: this._preventAutoLink, + inlineFormat: true, tags: '.nolink' }); }, diff --git a/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button-min.js b/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button-min.js index bce6ccd9dc1..b8d0e232db2 100644 --- a/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button-min.js +++ b/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_noautolink-button",function(e,t){e.namespace("M.atto_noautolink").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){this.addButton({icon:"e/prevent_autolink",callback:this._preventAutoLink,tags:".nolink"})},_preventAutoLink:function(){this.get("host").toggleInlineSelectionClass(["nolink"])}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]}); +YUI.add("moodle-atto_noautolink-button",function(e,t){e.namespace("M.atto_noautolink").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){this.addButton({icon:"e/prevent_autolink",callback:this._preventAutoLink,inlineFormat:!0,tags:".nolink"})},_preventAutoLink:function(){this.get("host").toggleInlineSelectionClass(["nolink"])}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]}); diff --git a/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button.js b/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button.js index 43a117105b4..d1fbd24168a 100644 --- a/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button.js +++ b/lib/editor/atto/plugins/noautolink/yui/build/moodle-atto_noautolink-button/moodle-atto_noautolink-button.js @@ -38,6 +38,7 @@ Y.namespace('M.atto_noautolink').Button = Y.Base.create('button', Y.M.editor_att this.addButton({ icon: 'e/prevent_autolink', callback: this._preventAutoLink, + inlineFormat: true, tags: '.nolink' }); }, diff --git a/lib/editor/atto/plugins/noautolink/yui/src/button/js/button.js b/lib/editor/atto/plugins/noautolink/yui/src/button/js/button.js index 6fd9c7b8a47..1f6db9d7cd4 100644 --- a/lib/editor/atto/plugins/noautolink/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/noautolink/yui/src/button/js/button.js @@ -36,6 +36,7 @@ Y.namespace('M.atto_noautolink').Button = Y.Base.create('button', Y.M.editor_att this.addButton({ icon: 'e/prevent_autolink', callback: this._preventAutoLink, + inlineFormat: true, tags: '.nolink' }); },