L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-51227-m29-master' of https://github.com/dthies/moodle into MOODLE_29_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2015-10-01 00:28:50 +02:00
parent 048a0996f1 4287eb3f85
commit f3acb82953
4 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
Vendored
+1 -6
View File
@@ -2341,12 +2341,9 @@ EditorStyling.prototype = {
*/
toggleInlineSelectionClass: function(toggleclasses) {
var classname = toggleclasses.join(" ");
var originalSelection = this.getSelection();
var cssApplier = rangy.createCssClassApplier(classname, {normalize: true});
cssApplier.toggleSelection();
this.setSelection(originalSelection);
},
/**
@@ -2354,12 +2351,11 @@ EditorStyling.prototype = {
*
* This will set inline styles on the current selection.
*
* @method toggleInlineSelectionClass
* @method formatSelectionInlineStyle
* @param {Array} styles - Style attributes to set on the nodes.
*/
formatSelectionInlineStyle: function(styles) {
var classname = this.PLACEHOLDER_CLASS;
var originalSelection = this.getSelection();
var cssApplier = rangy.createCssClassApplier(classname, {normalize: true});
cssApplier.applyToSelection();
@@ -2368,7 +2364,6 @@ EditorStyling.prototype = {
node.removeClass(classname).setStyles(styles);
}, this);
this.setSelection(originalSelection);
},
/**
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
Vendored
+1 -6
View File
@@ -2328,12 +2328,9 @@ EditorStyling.prototype = {
*/
toggleInlineSelectionClass: function(toggleclasses) {
var classname = toggleclasses.join(" ");
var originalSelection = this.getSelection();
var cssApplier = rangy.createCssClassApplier(classname, {normalize: true});
cssApplier.toggleSelection();
this.setSelection(originalSelection);
},
/**
@@ -2341,12 +2338,11 @@ EditorStyling.prototype = {
*
* This will set inline styles on the current selection.
*
* @method toggleInlineSelectionClass
* @method formatSelectionInlineStyle
* @param {Array} styles - Style attributes to set on the nodes.
*/
formatSelectionInlineStyle: function(styles) {
var classname = this.PLACEHOLDER_CLASS;
var originalSelection = this.getSelection();
var cssApplier = rangy.createCssClassApplier(classname, {normalize: true});
cssApplier.applyToSelection();
@@ -2355,7 +2351,6 @@ EditorStyling.prototype = {
node.removeClass(classname).setStyles(styles);
}, this);
this.setSelection(originalSelection);
},
/**
lib/editor/atto/yui/src/editor/js/styling.js
Vendored
+1 -6
View File
@@ -87,12 +87,9 @@ EditorStyling.prototype = {
*/
toggleInlineSelectionClass: function(toggleclasses) {
var classname = toggleclasses.join(" ");
var originalSelection = this.getSelection();
var cssApplier = rangy.createCssClassApplier(classname, {normalize: true});
cssApplier.toggleSelection();
this.setSelection(originalSelection);
},
/**
@@ -100,12 +97,11 @@ EditorStyling.prototype = {
*
* This will set inline styles on the current selection.
*
* @method toggleInlineSelectionClass
* @method formatSelectionInlineStyle
* @param {Array} styles - Style attributes to set on the nodes.
*/
formatSelectionInlineStyle: function(styles) {
var classname = this.PLACEHOLDER_CLASS;
var originalSelection = this.getSelection();
var cssApplier = rangy.createCssClassApplier(classname, {normalize: true});
cssApplier.applyToSelection();
@@ -114,7 +110,6 @@ EditorStyling.prototype = {
node.removeClass(classname).setStyles(styles);
}, this);
this.setSelection(originalSelection);
},
/**