Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:28:49 +0000 (09:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:28:49 +0000 (09:28 +1300)
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

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/editor.js

index ce5a2ef,2d09677..2d09677
mode 100644,100755..100644
@@@ -255,7 -255,7 +255,7 @@@ Y.extend(Editor, Y.Base, 
              prefix: 'atto'
          });
  
-         Y.delegate(['mouseup', 'keyup', 'focus'], this._hasSelectionChanged, document.body, '.' + CSS.CONTENT, this);
+         Y.delegate(['mouseup', 'keyup', 'focus'], this._hasSelectionChanged, document.body, '#' + this.editor.get('id'), this);
  
          return this;
      },