MDL-55461 atto_equation: allow inserting inside empty brackets

moodle · Dec 6, 2016 · 46045db · 46045db
1 parent e6cb76d
commit 46045db
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/...ugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js b/...ugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js
@@ -450,13 +450,15 @@ Y.namespace('M.atto_equation').Button = Y.Base.create('button', Y.M.editor_atto.
         while (equation.charAt(currentPos) === '\\' && currentPos >= 0) {
             currentPos -= 1;
         }
-        isChar = /[a-zA-Z\{\}]/;
+        isChar = /[a-zA-Z\{]/;
         if (currentPos !== 0) {
-            // Now match to the end of the line.
-            while (isChar.test(equation.charAt(currentPos)) &&
-                   currentPos < equation.length &&
-                   isChar.test(equation.charAt(currentPos - 1))) {
-                currentPos += 1;
+            if (equation.charAt(currentPos - 1) != '{') {
+                // Now match to the end of the line.
+                while (isChar.test(equation.charAt(currentPos)) &&
+                       currentPos < equation.length &&
+                       isChar.test(equation.charAt(currentPos - 1))) {
+                    currentPos += 1;
+                }
             }
         }
         // Save the cursor position - for insertion from the library.

diff --git a/...plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js b/...plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
diff --git a/...tto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button.js b/...tto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button.js
@@ -450,13 +450,15 @@ Y.namespace('M.atto_equation').Button = Y.Base.create('button', Y.M.editor_atto.
         while (equation.charAt(currentPos) === '\\' && currentPos >= 0) {
             currentPos -= 1;
         }
-        isChar = /[a-zA-Z\{\}]/;
+        isChar = /[a-zA-Z\{]/;
         if (currentPos !== 0) {
-            // Now match to the end of the line.
-            while (isChar.test(equation.charAt(currentPos)) &&
-                   currentPos < equation.length &&
-                   isChar.test(equation.charAt(currentPos - 1))) {
-                currentPos += 1;
+            if (equation.charAt(currentPos - 1) != '{') {
+                // Now match to the end of the line.
+                while (isChar.test(equation.charAt(currentPos)) &&
+                       currentPos < equation.length &&
+                       isChar.test(equation.charAt(currentPos - 1))) {
+                    currentPos += 1;
+                }
             }
         }
         // Save the cursor position - for insertion from the library.

diff --git a/lib/editor/atto/plugins/equation/yui/src/button/js/button.js b/lib/editor/atto/plugins/equation/yui/src/button/js/button.js
@@ -448,13 +448,15 @@ Y.namespace('M.atto_equation').Button = Y.Base.create('button', Y.M.editor_atto.
         while (equation.charAt(currentPos) === '\\' && currentPos >= 0) {
             currentPos -= 1;
         }
-        isChar = /[a-zA-Z\{\}]/;
+        isChar = /[a-zA-Z\{]/;
         if (currentPos !== 0) {
-            // Now match to the end of the line.
-            while (isChar.test(equation.charAt(currentPos)) &&
-                   currentPos < equation.length &&
-                   isChar.test(equation.charAt(currentPos - 1))) {
-                currentPos += 1;
+            if (equation.charAt(currentPos - 1) != '{') {
+                // Now match to the end of the line.
+                while (isChar.test(equation.charAt(currentPos)) &&
+                       currentPos < equation.length &&
+                       isChar.test(equation.charAt(currentPos - 1))) {
+                    currentPos += 1;
+                }
             }
         }
         // Save the cursor position - for insertion from the library.