Refactorization

diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index 2c3b6d3..d8b30b7 100644 (file)
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -1,28 +1,36 @@
 rng.modules.visualEditor = function(sandbox) {\r
     var transformations = rng.modules.visualEditor.transformations;\r
 \r
 rng.modules.visualEditor = function(sandbox) {\r
     var transformations = rng.modules.visualEditor.transformations;\r
 \r

-    var view = $(sandbox.getTemplate('main')());\r
-    var isDirty = false;\r
-    \r
-    var getMetaData = function() {\r
-        var toret = {};\r
-        view.find('#rng-visualEditor-meta table tr').each(function() {\r
-            var tr = $(this);\r
-            var key = $(tr.find('td')[0]).html();\r
-            var value = $(tr.find('td input')[0]).val();\r
-            toret[key] = value;\r
-        });\r
-        console.log(toret);\r
-        return toret;\r
+    var view = {\r
+        node: $(sandbox.getTemplate('main')()),\r
+        getMetaData: function() {\r
+            var toret = {};\r
+            this.node.find('#rng-visualEditor-meta table tr').each(function() {\r
+                var tr = $(this);\r
+                var key = $(tr.find('td')[0]).html();\r
+                var value = $(tr.find('td input')[0]).val();\r
+                toret[key] = value;\r
+            });\r
+            console.log(toret);\r
+            return toret;\r
+        },\r
+        setMetaData: function(metadata) {\r
+            var table = this.node.find('#rng-visualEditor-meta table');\r
+            table.empty();\r
+            _.each(_.keys(metadata), function(key) {    \r
+                $(sandbox.getTemplate('metaItem')({key: key, value: metadata[key]})).appendTo(table);\r
+            });\r
+        },\r
+        setBody: function(HTMLTree) {\r
+            this.node.find('#rng-visualEditor-content').html(HTMLTree);\r
+        },\r
+        getBody: function() {\r
+            return this.find('#rng-visualEditor-content').html();\r
+        }   \r

     };\r
     \r
     };\r
     \r

-    var setMetaData = function(metadata) {\r
-        var table = view.find('#rng-visualEditor-meta table');\r
-        table.empty();\r
-        _.each(_.keys(metadata), function(key) {    \r
-            $(sandbox.getTemplate('metaItem')({key: key, value: metadata[key]})).appendTo(table);\r
-        });\r
-    };\r
+    var isDirty = false;\r
+    \r

     \r
     $('#rng-visualEditor-content', view).on('keyup', function() {\r
         isDirty = true;\r
     \r
     $('#rng-visualEditor-content', view).on('keyup', function() {\r
         isDirty = true;\r


@@ -37,16 +45,16 @@ rng.modules.visualEditor = function(sandbox) {
             sandbox.publish('ready');\r
         },\r
         getView: function() {\r
             sandbox.publish('ready');\r
         },\r
         getView: function() {\r

-            return view;\r
+            return view.node;\r

         },\r
         setDocument: function(xml) {\r
             var transformed = transformations.fromXML.getDocumentDescription(xml);\r
         },\r
         setDocument: function(xml) {\r
             var transformed = transformations.fromXML.getDocumentDescription(xml);\r

-            $('#rng-visualEditor-content', view).html(transformed.HTMLTree);\r
-            setMetaData(transformed.metadata);\r
+            view.setBody(transformed.HTMLTree);\r
+            view.setMetaData(transformed.metadata);\r

             isDirty = false;\r
         },\r
         getDocument: function() {\r
             isDirty = false;\r
         },\r
         getDocument: function() {\r

-            return transformations.toXML.getXML({HTMLTree: $('#rng-visualEditor-content').html(), metadata: getMetaData()});\r
+            return transformations.toXML.getXML({HTMLTree: view.getBody(), metadata: view.getMetaData()});\r

         },\r
         isDirty: function() {\r
             return isDirty;\r
         },\r
         isDirty: function() {\r
             return isDirty;\r