- Fix for #501.

- Fix for using when with conditionals (not allowed)
GetmeUK · May 21, 2018 · 5a8fe95 · 5a8fe95
1 parent f3cd763
commit 5a8fe95
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 50 deletions.
diff --git a/build/content-tools.js b/build/content-tools.js
diff --git a/build/content-tools.min.css b/build/content-tools.min.css
diff --git a/build/content-tools.min.js b/build/content-tools.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ContentTools",
   "description": "A JS library for building WYSIWYG editors for HTML content",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "keywords": [
     "wysiwyg",
     "inline",

diff --git a/spec/content-tools-spec.js b/spec/content-tools-spec.js
diff --git a/src/scripts/editor.coffee b/src/scripts/editor.coffee
@@ -477,7 +477,7 @@ class _EditorApp extends ContentTools.ComponentUI
                 continue
 
             # Skip whitespace text elements
-            if node.nodeName = '#text' and node.textContent.trim() == ''
+            if node.nodeName == '#text' and node.textContent.trim() == ''
                 continue
 
             # Attempt to convert the node to a ContentEdit element

diff --git a/src/scripts/ui/toolbox.coffee b/src/scripts/ui/toolbox.coffee
@@ -275,21 +275,24 @@ class ContentTools.ToolboxUI extends ContentTools.WidgetUI
             undo = false
 
             switch os
-                when 'linux' and not ev.altKey
-                    if ev.keyCode is 90 and ev.ctrlKey
-                        redo = ev.shiftKey
-                        undo = not redo
-
-                when 'mac' and not (ev.altKey or ev.ctrlKey)
-                    if ev.keyCode is 90 and ev.metaKey
-                        redo = ev.shiftKey
-                        undo = not redo
-
-                when 'windows' and not ev.altKey or ev.shiftKey
-                    if ev.keyCode is 89 and ev.ctrlKey
-                        redo = true
-                    if ev.keyCode is 90 and ev.ctrlKey
-                        undo = true
+                when 'linux'
+                    if not ev.altKey
+                        if ev.keyCode is 90 and ev.ctrlKey
+                            redo = ev.shiftKey
+                            undo = not redo
+
+                when 'mac'
+                    if not (ev.altKey or ev.ctrlKey)
+                        if ev.keyCode is 90 and ev.metaKey
+                            redo = ev.shiftKey
+                            undo = not redo
+
+                when 'windows'
+                    if not ev.altKey or ev.shiftKey
+                        if ev.keyCode is 89 and ev.ctrlKey
+                            redo = true
+                        if ev.keyCode is 90 and ev.ctrlKey
+                            undo = true
 
             # Perform undo/redo
             if undo and ContentTools.Tools.Undo.canApply(null, null)
@@ -554,4 +557,4 @@ class ContentTools.ToolUI extends ContentTools.AnchoredComponentUI
 
         # Reset the mouse down flag
         @_mouseDown = false
-        @removeCSSClass('ct-tool--down')
+        @removeCSSClass('ct-tool--down')
diff --git a/src/spec/ui/toolbox.coffee b/src/spec/ui/toolbox.coffee
@@ -315,4 +315,4 @@ describe 'ContentTools.ToolboxUI', () ->
             # Check the tool is enabled after an update if an element is
             # provided.
             tool.update(element)
-            expect(tool.disabled()).toBe false
+            expect(tool.disabled()).toBe false