Visual editor - beautify source

[fnpeditor.git] / modules / visualEditor.js

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 012f7a9..d5ff4b5 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -106,6 +106,12 @@ rng.modules.visualEditor = function(sandbox) {
                 anchor = anchor.parent();\r
                 todel.remove();\r
             }\r
+            if(anchorOffset > 0 && anchorOffset < anchor.text().length) {\r
+                if(wlxmlTag === null && wlxmlClass === null) {\r
+                    return this.splitWithNewNode(anchor);\r
+                }\r
+                return this.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
+            }\r
             var newNode = this._createNode(wlxmlTag || anchor.attr('wlxml-tag'), wlxmlClass || anchor.attr('wlxml-class'));\r
             if(anchorOffset === 0)\r
                 anchor.before(newNode)\r
@@ -115,7 +121,6 @@ rng.modules.visualEditor = function(sandbox) {
             isDirty = true;\r
         },\r
         wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
-            \r
             var selection = window.getSelection();\r
             if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {\r
                 var startOffset = selection.anchorOffset;\r
@@ -130,7 +135,7 @@ rng.modules.visualEditor = function(sandbox) {
                 var suffix = node.data.substr(endOffset);\r
                 var core = node.data.substr(startOffset, endOffset - startOffset);\r
                 var newNode = this._createNode(wlxmlTag, wlxmlClass);\r
-                newNode.text(core);\r
+                newNode.text(core || 'test');\r
                 $(node).replaceWith(newNode);\r
                 newNode.before(prefix);\r
                 newNode.after(suffix);\r
@@ -138,6 +143,31 @@ rng.modules.visualEditor = function(sandbox) {
                 isDirty = true;\r
             }\r
         },\r
+        splitWithNewNode: function(node) {\r
+            var selection = window.getSelection();\r
+            if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {\r
+                var startOffset = selection.anchorOffset;\r
+                var endOffset = selection.focusOffset;\r
+                if(startOffset > endOffset) {\r
+                    var tmp = startOffset;\r
+                    startOffset = endOffset;\r
+                    endOffset = tmp;\r
+                }\r
+                var anchor = selection.anchorNode;\r
+                var prefix = anchor.data.substr(0, startOffset);\r
+                var suffix = anchor.data.substr(endOffset);\r
+                var prefixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
+                var newNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
+                var suffixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
+                prefixNode.text(prefix);\r
+                suffixNode.text(suffix);\r
+                node.replaceWith(newNode);\r
+                newNode.before(prefixNode);\r
+                newNode.after(suffixNode);\r
+                mediator.nodeCreated(newNode);\r
+                isDirty = true;\r
+            }\r
+        },\r
         getMetaData: function() {\r
             var toret = {};\r
             this.metaTable.find('tr').each(function() {\r
@@ -285,16 +315,18 @@ rng.modules.visualEditor = function(sandbox) {
         },\r
         updateEditPane: function(node) {\r
             var pane = this.node.find('#rng-visualEditor-edit');\r
+            var parentClass = node.parent().attr('wlxml-class');\r
             pane.html( $(sandbox.getTemplate('editPane')({tag: node.attr('wlxml-tag'), klass: node.attr('wlxml-class')})));\r
             \r
             var parent = node.parent('[wlxml-tag]').length ? {\r
-                repr: node.parent().attr('wlxml-tag') + ' / ' + (node.parent().attr('wlxml-class') || '[[no class]]'),\r
+                repr: node.parent().attr('wlxml-tag') + (parentClass ? ' / ' + parentClass : ''),\r
                 id: node.parent().attr('id')\r
             } : undefined;\r
             var children = [];\r
             node.children('[wlxml-tag]').each(function() {\r
                 var child = $(this);\r
-                children.push({repr: child.attr('wlxml-tag') + ' / ' + (child.attr('wlxml-class') || '[[no class]]'), id: child.attr('id')});\r
+                var childClass = child.attr('wlxml-class');\r
+                children.push({repr: child.attr('wlxml-tag') + (childClass ? ' / ' + childClass : ''), id: child.attr('id')});\r
             });\r
             var naviTemplate = sandbox.getTemplate('editPaneNavigation')({parent: parent, children: children});\r
             pane.find('.rng-visualEditor-editPaneSurrouding > div').html($(naviTemplate));\r
@@ -321,7 +353,7 @@ rng.modules.visualEditor = function(sandbox) {
                     mediator.toolbarButtonToggled(btn.attr('data-btn'), btn.hasClass('active'));\r
                 }\r
                 if(btn.attr('data-btn-type') === 'cmd') {\r
-                    mediator.toolbarButtonCmd(btn.attr('data-btn'));\r
+                    mediator.toolbarButtonCmd(btn.attr('data-btn'), btn.attr('data-meta'));\r
                 }\r
             });\r
         },\r
@@ -393,12 +425,19 @@ rng.modules.visualEditor = function(sandbox) {
             if(btn === 'tags')\r
                 view.toggleTags(toggle);\r
         },\r
-        toolbarButtonCmd: function(btn) {\r
+        toolbarButtonCmd: function(btn, meta) {\r
             if(btn === 'new-node') {\r
+                var wlxmlTag = toolbarView.getOption('newTag-tag');\r
+                var wlxmlClass = toolbarView.getOption('newTag-class');\r
+                if(meta) {\r
+                    var split = meta.split('/');\r
+                    wlxmlTag = split[0];\r
+                    wlxmlClass = split[1];\r
+                }\r
                 if(window.getSelection().isCollapsed)\r
-                    view.insertNewNode(toolbarView.getOption('newTag-tag'), toolbarView.getOption('newTag-class'));\r
+                    view.insertNewNode(wlxmlTag, wlxmlClass);\r
                 else {\r
-                    this.wrapWithNodeRequest(toolbarView.getOption('newTag-tag'), toolbarView.getOption('newTag-class'));\r
+                    this.wrapWithNodeRequest(wlxmlTag, wlxmlClass);\r
                 }\r
                     \r
                     \r