Merge branch 'MDL-49732_master' of https://github.com/jinhofer/moodle

dcmul · Jul 7, 2015 · 525dce0 · 525dce0
2 parents 17d47fa + 36231b6
commit 525dce0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/...itor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js b/...itor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
@@ -84,6 +84,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
         // Add the link button first.
         this.addButton({
             icon: 'e/insert_edit_link',
+            keys: '75',
             callback: this._displayDialogue,
             tags: 'a',
             tagMatchRequiresAll: false

diff --git a/...editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js b/...editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
@@ -84,6 +84,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
         // Add the link button first.
         this.addButton({
             icon: 'e/insert_edit_link',
+            keys: '75',
             callback: this._displayDialogue,
             tags: 'a',
             tagMatchRequiresAll: false

diff --git a/lib/editor/atto/plugins/link/yui/src/button/js/button.js b/lib/editor/atto/plugins/link/yui/src/button/js/button.js
@@ -82,6 +82,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
         // Add the link button first.
         this.addButton({
             icon: 'e/insert_edit_link',
+            keys: '75',
             callback: this._displayDialogue,
             tags: 'a',
             tagMatchRequiresAll: false