Merge branch 'wip-MDL-55183-master' of git://github.com/abgreeve/moodle

Conflicts: lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2016-07-26 09:52:51 +08:00
parent db044a0997 c17c25db05
commit 1a9c3d587f
4 changed files with 4 additions and 1 deletions
@@ -2835,6 +2835,7 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorFilepicker]);
        "event-simulate",
        "event-custom",
        "node-event-html5",
+        "node-event-simulate",
        "yui-throttle",
        "moodle-core-notification-dialogue",
        "moodle-core-notification-confirm",
@@ -2821,6 +2821,7 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorFilepicker]);
        "event-simulate",
        "event-custom",
        "node-event-html5",
+        "node-event-simulate",
        "yui-throttle",
        "moodle-core-notification-dialogue",
        "moodle-core-notification-confirm",
@@ -10,6 +10,7 @@
            "event-simulate",
            "event-custom",
            "node-event-html5",
+            "node-event-simulate",
            "yui-throttle",
            "moodle-core-notification-dialogue",
            "moodle-core-notification-confirm",