Merge branch 'MDL-51605-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 08:46:00 +0000 (09:46 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 08:46:00 +0000 (09:46 +0100)
1  2 
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
lib/editor/atto/yui/src/editor/js/styling.js

@@@ -87,9 -87,12 +87,9 @@@ EditorStyling.prototype = 
       */
      toggleInlineSelectionClass: function(toggleclasses) {
          var classname = toggleclasses.join(" ");
-         var cssApplier = rangy.createCssClassApplier(classname, {normalize: true});
 -        var originalSelection = this.getSelection();
+         var cssApplier = rangy.createClassApplier(classname, {normalize: true});
  
          cssApplier.toggleSelection();
 -
 -        this.setSelection(originalSelection);
      },
  
      /**
       */
      formatSelectionInlineStyle: function(styles) {
          var classname = this.PLACEHOLDER_CLASS;
-         var cssApplier = rangy.createCssClassApplier(classname, {normalize: true});
 -        var originalSelection = this.getSelection();
+         var cssApplier = rangy.createClassApplier(classname, {normalize: true});
  
          cssApplier.applyToSelection();