Merge branch 'MDL-46712-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE

mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js

@@ -3224,6 +3224,7 @@ EDITOR.prototype = {
         }
         this.dialogue.centerDialogue();
         this.dialogue.show();
+        drawingcanvas.on('windowresize', this.resize, this);
     },
 
     /**
@@ -3730,6 +3731,16 @@ EDITOR.prototype = {
         this.currentedit.path = [];
     },
 
+    /**
+     * Resize the dialogue window when the browser is resized.
+     * @public
+     * @method resize
+     */
+    resize : function() {
+        this.dialogue.centerDialogue();
+        return true;
+    },
+
     /**
      * Factory method for creating annotations of the correct subclass.
      * @public
@@ -4030,6 +4041,7 @@ M.assignfeedback_editpdf.editor.init = M.assignfeedback_editpdf.editor.init || f
         "graphics",
         "json",
         "event-move",
+        "event-resize",
         "querystring-stringify-simple",
         "moodle-core-notification-dialog",
         "moodle-core-notification-exception",

mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js

@@ -3224,6 +3224,7 @@ EDITOR.prototype = {
         }
         this.dialogue.centerDialogue();
         this.dialogue.show();
+        drawingcanvas.on('windowresize', this.resize, this);
     },
 
     /**
@@ -3730,6 +3731,16 @@ EDITOR.prototype = {
         this.currentedit.path = [];
     },
 
+    /**
+     * Resize the dialogue window when the browser is resized.
+     * @public
+     * @method resize
+     */
+    resize : function() {
+        this.dialogue.centerDialogue();
+        return true;
+    },
+
     /**
      * Factory method for creating annotations of the correct subclass.
      * @public
@@ -4030,6 +4041,7 @@ M.assignfeedback_editpdf.editor.init = M.assignfeedback_editpdf.editor.init || f
         "graphics",
         "json",
         "event-move",
+        "event-resize",
         "querystring-stringify-simple",
         "moodle-core-notification-dialog",
         "moodle-core-notification-exception",

mod/assign/feedback/editpdf/yui/src/editor/js/editor.js

@@ -316,6 +316,7 @@ EDITOR.prototype = {
         }
         this.dialogue.centerDialogue();
         this.dialogue.show();
+        drawingcanvas.on('windowresize', this.resize, this);
     },
 
     /**
@@ -822,6 +823,16 @@ EDITOR.prototype = {
         this.currentedit.path = [];
     },
 
+    /**
+     * Resize the dialogue window when the browser is resized.
+     * @public
+     * @method resize
+     */
+    resize : function() {
+        this.dialogue.centerDialogue();
+        return true;
+    },
+
     /**
      * Factory method for creating annotations of the correct subclass.
      * @public

mod/assign/feedback/editpdf/yui/src/editor/meta/editor.json

@@ -8,6 +8,7 @@
         "graphics",
         "json",
         "event-move",
+        "event-resize",
         "querystring-stringify-simple",
         "moodle-core-notification-dialog",
         "moodle-core-notification-exception",