Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/components/layout/tools-properties.reel/tools-properties.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 13 insertions, 3 deletions

diff --git a/js/document/models/html.js b/js/document/models/html.js
index ff57454b..1639a8e2 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -6,16 +6,26 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-    BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
+var Montage =                           require("montage/core/core").Montage,
+    BaseDocumentModel =         require("js/document/models/base").BaseDocumentModel,
+    webGlDocumentHelper =       require("js/document/helpers/webgl-helper").webGlDocumentHelper;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
-                enumerable: false,
         value: false
+    },
+        ////////////////////////////////////////////////////////////////////
+        //
+    draw3DGrid: {
+        value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        webGlHelper: {
+        value: webGlDocumentHelper
     }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////