MDL-47159 atto_link: Adding prefix when url doesn't specify one
authorDavid Monllao <davidm@moodle.com>
Wed, 21 Jan 2015 07:50:44 +0000 (15:50 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 4 Feb 2015 02:23:04 +0000 (10:23 +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 72a694a..838fe81 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 bcdefd1..ba3cf0c 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 72a694a..838fe81 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 c78379e..0215e86 100644 (file)
@@ -213,6 +213,14 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
         if (value !== '') {
             this.editor.focus();
             host.setSelection(this._currentSelection);
+
+            // We add a prefix if it is not already prefixed.
+            value = value.trim();
+            var expr = new RegExp(/^[a-zA-Z]*\.*\/|^#|^[a-zA-Z]*:/);
+            if (!expr.test(value)) {
+                value = 'http://' + value;
+            }
+
             document.execCommand('unlink', false, null);
             document.execCommand('createLink', false, value);