Merge branch 'refs/heads/ninja-internal-master' into bugfix-master

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

3 files changed, 29 insertions, 8 deletions

diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css
index 13537ba1..2c2e30d3 100755
--- a/js/stage/stage.reel/stage.css
+++ b/js/stage/stage.reel/stage.css
@@ -12,6 +12,16 @@
     overflow: hidden;
 }
 
+.montage-editor-container {
+    z-index: 8;
+    display: none;
+    position: absolute;
+}
+
+.stageAndScenesContainer .montage-editor {
+    -webkit-user-select:text;
+}
+
 .codeViewContainer {
   position: absolute;
   top: 0px;
@@ -55,4 +65,5 @@ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;backgroun
 .cm-s-monokai .activeline {background: #8da6ce; !important}
 .cm-s-rubyblue .activeline {background: #3E7087; !important}
 .cm-s-lesser-dark .activeline {background: #8da6ce; !important}
-.cm-s-xq-dark .activeline {background: #8da6ce; !important}
\ No newline at end of file
+.cm-s-xq-dark .activeline {background: #8da6ce; !important}
+
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 2ed596f3..215f8f2e 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -40,7 +40,13 @@
             "focusManager": {
                 "object": "js/components/focus-manager.reel"
             },
-            
+
+            "bindingView": {
+                "prototype": "js/stage/binding-view.reel",
+                "properties" : {
+                    "element": {"#": "bindingView" }
+                }
+            },
             "owner": {
                 "prototype": "js/stage/stage.reel",
                 "properties": {
@@ -53,7 +59,8 @@
                     "stageDeps": {"@": "stageDeps"},
                     "layout":   {"@": "layout"},
                     "textTool": {"@": "textTool"},
-                    "focusManager": {"@": "focusManager"}
+                    "focusManager": {"@": "focusManager"},
+                    "bindingView": {"@": "bindingView"}
                 },
                 "bindings": {
                     "currentDocumentStageView": {
@@ -77,6 +84,7 @@
         <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas>
         <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas>
         <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas>
+        <section data-montage-id="bindingView"></section>
     </section>
 
 </body>
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 14bc00eb..8cbe3210 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -27,6 +27,9 @@ exports.Stage = Montage.create(Component, {
     _canvasSelectionPrefs:  { value: { "thickness" : 1.0, "color" : "#46a1ff" } },
     _canvasDrawingPrefs:    { value: { "thickness" : 1.0, "color" : "#000" } },
     drawingContextPreferences: { get: function() { return this._canvasDrawingPrefs; } },
+    bindingView: {
+        value: null
+    },
 
     _iframeContainer: {
         value: null,
@@ -320,9 +323,8 @@ exports.Stage = Montage.create(Component, {
         value: function() {
             if(this.resizeCanvases) {
                 // TODO GET THE SCROLL SIZE FROM THE CSS -- 11 px
-                this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.element.offsetWidth - 11 ;
-                this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.element.offsetHeight - 11;// - 26 - 26;
-
+                this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.bindingView.width = this.element.offsetWidth - 11;
+                this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height =  this.bindingView.height = this.element.offsetHeight - 11;// - 26 - 26;
                 // Hack for now until a full component
                 this.layout.draw();
                 if(this.currentDocument && (this.currentDocument.currentView === "design")) {
@@ -407,8 +409,8 @@ exports.Stage = Montage.create(Component, {
             }
 
             // Recalculate the canvas sizes because of splitter resizing
-            this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.element.offsetWidth - 11 ;
-            this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.element.offsetHeight - 11;
+            this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.bindingView.width = this.element.offsetWidth - 11 ;
+            this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.bindingView.height = this.element.offsetHeight - 11;
 
             designView.iframe.contentWindow.addEventListener("scroll", this, false);