Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

3 files changed, 22 insertions, 6 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 6d9d2e89..76a5e62b 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -62,6 +62,20 @@ exports.BaseDocumentModel = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+    _selection: {
+        value: []
+    },
+
+    selection: {
+        get: function() {
+            return this._selection;
+        },
+        set: function(value) {
+            this._selection = value;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     fileTemplate: {
         value: null
     },
diff --git a/js/document/models/html.js b/js/document/models/html.js
index fd42d4de..9aa0d27e 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -18,9 +18,12 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
-    //
-    selection: {
-        value: []
+        //Called by the document immidiately after the model is created
+    init: {
+        value:function() {
+                //Creating instance of the webGL helper for this model
+                this.webGlHelper = webGlDocumentHelper.create();
+                }           
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -57,7 +60,7 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     ////////////////////////////////////////////////////////////////////
         //
         webGlHelper: {
-        value: webGlDocumentHelper
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
         //
diff --git a/js/document/models/text.js b/js/document/models/text.js
index d1252b7d..6cb61d48 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -22,7 +22,7 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
     save: {
         enumerable: false,
         value: function (callback) {
-            this.application.ninja.documentController.activeDocument.model.views.code.editor.save();//save to textarea
+            this.application.ninja.currentDocument.model.views.code.editor.save();//save to textarea
 
             var self = this;
 
@@ -60,7 +60,6 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
                 }
                 //
                 this.parentContainer.removeChild(this.views.code.textViewContainer);
-                this.application.ninja.stage.showCodeViewBar(false);
                 this.application.ninja.stage.restoreAllPanels();
                 this.views.code = null;