bringing back wrapping text with nodes

diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js
index 80d3915..a6becf4 100644 (file)
--- a/modules/documentCanvas/canvas.js
+++ b/modules/documentCanvas/canvas.js
@@ -76,6 +76,7 @@ Canvas.prototype.insertNode = function(options) {
         $(textElement).replaceWith(newNode);\r
         newNode.before(prefix);\r
         newNode.after(suffix);\r
         $(textElement).replaceWith(newNode);\r
         newNode.before(prefix);\r
         newNode.after(suffix);\r

+        return newNode;\r

     }\r
 }\r
 \r
     }\r
 }\r
 \r

diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js
index 3ced49a..5d17ec0 100644 (file)
--- a/modules/documentCanvas/canvasManager.js
+++ b/modules/documentCanvas/canvasManager.js
@@ -96,6 +96,27 @@ Manager.prototype.selectNode = function(wlxmlNode, options) {
     this.sandbox.publish('nodeSelected', wlxmlNode);\r
 };\r
 \r
     this.sandbox.publish('nodeSelected', wlxmlNode);\r
 };\r
 \r

+Manager.prototype.insertNewNode = function(wlxmlTag, wlxmlClass) {\r
+    var selection = window.getSelection();\r
+\r
+    if(selection.getRangeAt(0).collapsed) {\r
+    \r
+    } else {\r
+        var offsetStart = selection.anchorOffset;\r
+        var offsetEnd = selection.focusOffset;\r
+        if(offsetStart > offsetEnd) {\r
+            var tmp = offsetStart;\r
+            offsetStart = offsetEnd;\r
+            offsetEnd = tmp;\r
+        }\r
+        var node = new wlxmlNode.Node($(selection.anchorNode).parent());\r
+        var newNode = this.canvas.insertNode({place: 'wrapText', context: node, tag: wlxmlTag, klass: wlxmlClass, offsetStart: offsetStart, offsetEnd: offsetEnd});\r
+        this.selectNode(new wlxmlNode.Node(newNode), {movecaret: 'end'});\r
+    }\r
+    \r
+    \r
+}\r
+\r

 Manager.prototype.getNodeElement = function(wlxmlNode) {\r
     return this.canvas.dom.find('#'+wlxmlNode.id);\r
 };\r
 Manager.prototype.getNodeElement = function(wlxmlNode) {\r
     return this.canvas.dom.find('#'+wlxmlNode.id);\r
 };\r

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index cc4964b..bec74fc 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -50,9 +50,6 @@ return function(sandbox) {
         insertNewNode: function(wlxmlTag, wlxmlClass) {\r
             manager.insertNewNode(wlxmlTag, wlxmlClass);\r
         },\r
         insertNewNode: function(wlxmlTag, wlxmlClass) {\r
             manager.insertNewNode(wlxmlTag, wlxmlClass);\r
         },\r

-        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
-            manager.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
-        },\r

         command: function(command, meta) {\r
             manager.command(command, meta);\r
         }\r
         command: function(command, meta) {\r
             manager.command(command, meta);\r
         }\r

diff --git a/modules/rng/rng.js b/modules/rng/rng.js
index 7c39d0f..a1fe65e 100644 (file)
--- a/modules/rng/rng.js
+++ b/modules/rng/rng.js
@@ -254,11 +254,7 @@ return function(sandbox) {
             sandbox.getModule('documentCanvas').toggleGrid(toggle);\r
         },\r
         newNodeRequested: function(wlxmlTag, wlxmlClass) {\r
             sandbox.getModule('documentCanvas').toggleGrid(toggle);\r
         },\r
         newNodeRequested: function(wlxmlTag, wlxmlClass) {\r

-            if(window.getSelection().isCollapsed) {\r

                 sandbox.getModule('documentCanvas').insertNewNode(wlxmlTag, wlxmlClass);\r
                 sandbox.getModule('documentCanvas').insertNewNode(wlxmlTag, wlxmlClass);\r

-            } else {\r
-                sandbox.getModule('documentCanvas').wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
-            }\r

         },\r
         command: function(cmd, meta) {\r
             sandbox.getModule('documentCanvas').command(cmd, meta);\r
         },\r
         command: function(cmd, meta) {\r
             sandbox.getModule('documentCanvas').command(cmd, meta);\r