smartxml: minor tests fix (incorrect grouping)

[fnpeditor.git] / src / editor / modules / sourceEditor / sourceEditor.js

diff --git a/src/editor/modules/sourceEditor/sourceEditor.js b/src/editor/modules/sourceEditor/sourceEditor.js
index a2ec127..8f0c833 100644 (file)
--- a/src/editor/modules/sourceEditor/sourceEditor.js
+++ b/src/editor/modules/sourceEditor/sourceEditor.js
@@ -1,10 +1,10 @@
-define(['libs/jquery'], function($) {
+define(['libs/jquery', 'libs/text!./template.html'], function($, template) {

 
 'use strict';
 
 return function(sandbox) {
 
 
 'use strict';
 
 return function(sandbox) {
 

-    var view = $(sandbox.getTemplate('main')()),
+    var view = $(template),

         documentIsDirty = true,
         documentEditedHere = false,
         wlxmlDocument;
         documentIsDirty = true,
         documentEditedHere = false,
         wlxmlDocument;


@@ -22,10 +22,14 @@ return function(sandbox) {
 
     view.onHide = function() {
         if(documentEditedHere) {
 
     view.onHide = function() {
         if(documentEditedHere) {

-            documentEditedHere = false;
-            wlxmlDocument.loadXML(editor.getValue());
+            commitDocument();

         }
     };
         }
     };

+
+    var commitDocument = function() {
+        documentEditedHere = false;
+        wlxmlDocument.loadXML(editor.getValue());
+    };

     
     /* globals ace */
     var editor = ace.edit(view.find('#rng-sourceEditor-editor')[0]),
     
     /* globals ace */
     var editor = ace.edit(view.find('#rng-sourceEditor-editor')[0]),


@@ -34,10 +38,6 @@ return function(sandbox) {
     session.setMode('ace/mode/xml');
     session.setUseWrapMode(true);
     
     session.setMode('ace/mode/xml');
     session.setUseWrapMode(true);
     

-    $('textarea', view).on('keyup', function() {
-        documentEditedHere = true;
-    });
-    

     editor.getSession().on('change', function() {
         documentEditedHere = true;
     });
     editor.getSession().on('change', function() {
         documentEditedHere = true;
     });


@@ -53,7 +53,14 @@ return function(sandbox) {
             wlxmlDocument.on('change', function() {
                 documentIsDirty = true;
             });
             wlxmlDocument.on('change', function() {
                 documentIsDirty = true;
             });

+            wlxmlDocument.on('contentSet', function() {
+                documentIsDirty = true;
+            });
+        },
+        changesCommited: function() {
+            return !documentEditedHere;

         },
         },

+        commitChanges: commitDocument,

         getDocument: function() {
             return editor.getValue();
         }
         getDocument: function() {
             return editor.getValue();
         }