MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)
authorDamyon Wiese <damyon@moodle.com>
Tue, 1 Oct 2013 03:58:15 +0000 (11:58 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 1 Oct 2013 03:58:15 +0000 (11:58 +0800)
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
lib/editor/atto/plugins/link/yui/src/button/js/button.js

index 454f1c7..2a4d90b 100644 (file)
Binary files a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js and b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js differ
index cb3e57f..cf87a38 100644 (file)
Binary files a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js and b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js differ
index 454f1c7..2a4d90b 100644 (file)
Binary files a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js and b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js differ
index 17be724..24f7594 100644 (file)
@@ -83,7 +83,7 @@ M.atto_link = M.atto_link || {
      * @param {Object} params
      */
     init : function(params) {
-        M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, this.display_chooser, this);
+        M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, this.display_chooser, this);
     },
 
     /**