L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski
2014-12-22 14:34:57 +00:00
parent 83906584e2 931317eba9
commit c8f22b65e7
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
Vendored
+8 -6
View File
@@ -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);
}
},
/**
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
Vendored
+8 -6
View File
@@ -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);
}
},
/**
lib/editor/atto/plugins/image/yui/src/button/js/button.js
Vendored
+8 -6
View File
@@ -210,22 +210,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);
}
},
/**