mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski 2014-12-22 14:36:46 +00:00
commit 7f384c8f92
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js vendored
View File

@ -214,7 +214,8 @@ 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);
this.editor.on('drop', this._handleDragDrop, this);
},
@ -330,21 +331,22 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
}
return false;
},
},
/**
* 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);
}
},
/**

6
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js vendored
View File

File diff suppressed because one or more lines are too long

16
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js vendored
View File

@ -214,7 +214,8 @@ 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);
this.editor.on('drop', this._handleDragDrop, this);
},
@ -330,21 +331,22 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
}
return false;
},
},
/**
* 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);
}
},
/**

16
lib/editor/atto/plugins/image/yui/src/button/js/button.js vendored
View File

@ -212,7 +212,8 @@ 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);
this.editor.on('drop', this._handleDragDrop, this);
},
@ -328,21 +329,22 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
}
return false;
},
},
/**
* 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);
}
},
/**