moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle

Browse source 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
This commit is contained in:
Dan Poltawski 2014-04-18 11:49:39 +08:00
commit d2b8b67a9c
4 changed files with 11 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js vendored
View file

@ -312,7 +312,6 @@ EditorPluginButtons.prototype = {
* specified, in the class for the button.
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @return {Node} The Node representing the newly created button.
*/
addButton: function(config) {
@ -429,7 +428,6 @@ EditorPluginButtons.prototype = {
* @param {string} [config.title=this.name] The string identifier in the plugin's language file.
* @param {string} [config.buttonName=this.name] The name of the button. This is used in the buttons object, and if
* specified, in the class for the button.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @return {Node} The Node representing the newly created button.
*/
addBasicButton: function(config) {
@ -469,7 +467,6 @@ EditorPluginButtons.prototype = {
* specified, in the class for the button.
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @param {array} config.entries List of menu entries with the string (entry.text) and the handlers (entry.handler).
* @param {number} [config.overlayWidth=14] The width of the menu. This will be suffixed with the 'em' unit.
* @param {string} [config.menuColor] menu icon background color
@ -656,7 +653,6 @@ EditorPluginButtons.prototype = {
* @param {object} config
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @param {object} [inheritFrom] A parent configuration that this configuration may inherit from.
* @return {object} The normalized configuration
* @private
@ -672,18 +668,10 @@ EditorPluginButtons.prototype = {
inheritFrom = {};
}
// By default, we wrap the callback in function to prevent the default action, check whether the editor is
// We wrap the callback in function to prevent the default action, check whether the editor is
// active and focus it, and then mark the field as updated.
if (typeof config.wrapCallback === 'undefined') {
config.wrapCallback = inheritFrom.wrapCallback || true;
}
if (config.wrapCallback) {
config._callback = config.callback || inheritFrom.callback;
config.callback = Y.rbind(this._callbackWrapper, this, config._callback, config.callbackArgs);
} else {
config.callback = config.callback || inheritFrom.callback;
}
config._callbackNormalized = true;

4
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js vendored
View file

File diff suppressed because one or more lines are too long

14
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js vendored
View file

@ -312,7 +312,6 @@ EditorPluginButtons.prototype = {
* specified, in the class for the button.
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @return {Node} The Node representing the newly created button.
*/
addButton: function(config) {
@ -429,7 +428,6 @@ EditorPluginButtons.prototype = {
* @param {string} [config.title=this.name] The string identifier in the plugin's language file.
* @param {string} [config.buttonName=this.name] The name of the button. This is used in the buttons object, and if
* specified, in the class for the button.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @return {Node} The Node representing the newly created button.
*/
addBasicButton: function(config) {
@ -467,7 +465,6 @@ EditorPluginButtons.prototype = {
* specified, in the class for the button.
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @param {array} config.entries List of menu entries with the string (entry.text) and the handlers (entry.handler).
* @param {number} [config.overlayWidth=14] The width of the menu. This will be suffixed with the 'em' unit.
* @param {string} [config.menuColor] menu icon background color
@ -654,7 +651,6 @@ EditorPluginButtons.prototype = {
* @param {object} config
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @param {object} [inheritFrom] A parent configuration that this configuration may inherit from.
* @return {object} The normalized configuration
* @private
@ -670,18 +666,10 @@ EditorPluginButtons.prototype = {
inheritFrom = {};
}
// By default, we wrap the callback in function to prevent the default action, check whether the editor is
// We wrap the callback in function to prevent the default action, check whether the editor is
// active and focus it, and then mark the field as updated.
if (typeof config.wrapCallback === 'undefined') {
config.wrapCallback = inheritFrom.wrapCallback || true;
}
if (config.wrapCallback) {
config._callback = config.callback || inheritFrom.callback;
config.callback = Y.rbind(this._callbackWrapper, this, config._callback, config.callbackArgs);
} else {
config.callback = config.callback || inheritFrom.callback;
}
config._callbackNormalized = true;

14
lib/editor/atto/yui/src/editor/js/editor-plugin-buttons.js vendored
View file

@ -164,7 +164,6 @@ EditorPluginButtons.prototype = {
* specified, in the class for the button.
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @return {Node} The Node representing the newly created button.
*/
addButton: function(config) {
@ -281,7 +280,6 @@ EditorPluginButtons.prototype = {
* @param {string} [config.title=this.name] The string identifier in the plugin's language file.
* @param {string} [config.buttonName=this.name] The name of the button. This is used in the buttons object, and if
* specified, in the class for the button.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @return {Node} The Node representing the newly created button.
*/
addBasicButton: function(config) {
@ -321,7 +319,6 @@ EditorPluginButtons.prototype = {
* specified, in the class for the button.
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @param {array} config.entries List of menu entries with the string (entry.text) and the handlers (entry.handler).
* @param {number} [config.overlayWidth=14] The width of the menu. This will be suffixed with the 'em' unit.
* @param {string} [config.menuColor] menu icon background color
@ -508,7 +505,6 @@ EditorPluginButtons.prototype = {
* @param {object} config
* @param {function} config.callback A callback function to call when the button is clicked.
* @param {object} [config.callbackArgs] Any arguments to pass to the callback.
* @param {boolean} [config.wrapCallback=true] Whether to wrap the callback in default functionality.
* @param {object} [inheritFrom] A parent configuration that this configuration may inherit from.
* @return {object} The normalized configuration
* @private
@ -524,18 +520,10 @@ EditorPluginButtons.prototype = {
inheritFrom = {};
}
// By default, we wrap the callback in function to prevent the default action, check whether the editor is
// We wrap the callback in function to prevent the default action, check whether the editor is
// active and focus it, and then mark the field as updated.
if (typeof config.wrapCallback === 'undefined') {
config.wrapCallback = inheritFrom.wrapCallback || true;
}
if (config.wrapCallback) {
config._callback = config.callback || inheritFrom.callback;
config.callback = Y.rbind(this._callbackWrapper, this, config._callback, config.callbackArgs);
} else {
config.callback = config.callback || inheritFrom.callback;
}
config._callbackNormalized = true;