Merge branch 'MDL-48062-m27-master' of https://github.com/dthies/moodle…

… into MOODLE_27_STABLE
moodle · Dec 22, 2014 · c8f22b6 · c8f22b6
2 parents 8390658 + 931317e
commit c8f22b6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/...r/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/...r/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
@@ -212,22 +212,24 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             tags: 'img',
             tagMatchRequiresAll: false
         });
-        this.editor.delegate('dblclick', this._handleDoubleClick, 'img', this);
+        this.editor.delegate('dblclick', this._displayDialogue, 'img', this);
+        this.editor.delegate('click', this._handleClick, 'img', this);
     },
 
     /**
-     * Handle a double click on an image.
+     * Handle a click on an image.
      *
-     * @method _handleDoubleClick
+     * @method _handleClick
      * @param {EventFacade} e
      * @private
      */
-    _handleDoubleClick: function(e) {
+    _handleClick: function(e) {
         var image = e.target;
 
         var selection = this.get('host').getSelectionFromNode(image);
-        this.get('host').setSelection(selection);
-        this._displayDialogue();
+        if (this.get('host').getSelection() !== selection) {
+            this.get('host').setSelection(selection);
+        }
     },
 
     /**