Merge branch 'refs/heads/NinjaInternal' into Color

4 files changed, 52 insertions, 42 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 1a491210..56bb70bf 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -195,11 +195,30 @@ exports.Layout = Montage.create(Component, {
                 bounds3D[j] = tmpPt;
             }
 
-            // Draw the Item ouline
-            this._dashedLine(bounds3D[3][0] - 0.5,bounds3D[3][1]- 0.5,bounds3D[0][0] + 2.5, bounds3D[0][1] - 0.5,[5,5]);
-            this._dashedLine(bounds3D[0][0] - 0.5, bounds3D[0][1] - 0.5, bounds3D[1][0]- 0.5, bounds3D[1][1] + 0.5, [5,5] );
-            this._dashedLine(bounds3D[1][0] - 0.5 , bounds3D[1][1] + 0.5, bounds3D[2][0]+ 0.5, bounds3D[2][1] + 0.5, [5,5] );
-            this._dashedLine(bounds3D[2][0] + 0.5, bounds3D[2][1] + 0.5, bounds3D[3][0] + 0.5, bounds3D[3][1] - 0.5, [5,5] );
+            if(item.uuid === this.application.ninja.currentSelectedContainer.uuid) {
+                this.ctx.save();
+                this.ctx.strokeStyle = "#C61F00";
+
+                this.ctx.beginPath();
+
+                this.ctx.moveTo( bounds3D[3][0] + 0.5 ,  bounds3D[3][1] - 0.5 );
+
+                this.ctx.lineTo( bounds3D[0][0] - 0.5 ,  bounds3D[0][1] - 0.5 );
+                this.ctx.lineTo( bounds3D[1][0] - 0.5 ,  bounds3D[1][1] + 0.5 );
+                this.ctx.lineTo( bounds3D[2][0] + 0.5  ,  bounds3D[2][1] + 0.5 );
+                this.ctx.lineTo( bounds3D[3][0] + 0.5  ,  bounds3D[3][1] + 0.5 );
+
+                this.ctx.closePath();
+                this.ctx.stroke();
+
+                this.ctx.restore();
+            } else {
+                // Draw the Item ouline
+                this._dashedLine(bounds3D[3][0] - 0.5,bounds3D[3][1]- 0.5,bounds3D[0][0] + 2.5, bounds3D[0][1] - 0.5,[5,5]);
+                this._dashedLine(bounds3D[0][0] - 0.5, bounds3D[0][1] - 0.5, bounds3D[1][0]- 0.5, bounds3D[1][1] + 0.5, [5,5] );
+                this._dashedLine(bounds3D[1][0] - 0.5 , bounds3D[1][1] + 0.5, bounds3D[2][0]+ 0.5, bounds3D[2][1] + 0.5, [5,5] );
+                this._dashedLine(bounds3D[2][0] + 0.5, bounds3D[2][1] + 0.5, bounds3D[3][0] + 0.5, bounds3D[3][1] - 0.5, [5,5] );
+            }
 
             // Draw the Label is all mode
             if(this.layoutView === "layoutAll") {
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 46d74e13..dc9980f0 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -98,9 +98,9 @@ exports.StageView = Montage.create(Component, {
                        onChange: function(){
                            var historySize = doc.editor.historySize();
                            if(historySize.undo>0){
-                                doc.dirtyFlag=true;
+                                doc.needsSave = true;
                            }else if(historySize.undo===0 && historySize.redo>0){
-                               doc.dirtyFlag=false;
+                               doc.needsSave = false;
                            }
                        },
                        onCursorActivity: function() {
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 9ed0f636..812e3d55 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -82,7 +82,7 @@
     <section id="stageAndScenesContainer" class="stageAndScenesContainer">
         <section id="stageView"></section>
         <section id="iframeContainer"></section>
-        <section id="textToolObject">asdasd asd asd asd asd asd </section>
+        <section id="textToolObject"></section>
         <canvas id="layoutCanvas"></canvas>
         <canvas id="stageCanvas"></canvas>
         <canvas id="drawingCanvas"></canvas>
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 59eb9317..44e14827 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -19,8 +19,6 @@ exports.Stage = Montage.create(Component, {
     zoomFactor: {value : 1 },
 
     _canvasSelectionPrefs:  { value: { "thickness" : 1.0, "color" : "#46a1ff" } },
-    _editSymbolPrefs:       { value: { "thickness" : 2.0, "color" : "#C61F00" } },
-
     _canvasDrawingPrefs:    { value: { "thickness" : 1.0, "color" : "#000" } },
     drawingContextPreferences: { get: function() { return this._canvasDrawingPrefs; } },
 
@@ -201,6 +199,7 @@ exports.Stage = Montage.create(Component, {
             this._drawingCanvas.addEventListener("mousedown", this, false);
             this._drawingCanvas.addEventListener("mouseup", this, false);
             this._drawingCanvas.addEventListener("dblclick", this, false);
+            this._drawingCanvas.addEventListener("mousewheel", this, false);
 
             // Hide the canvas
             this.hideCanvas(true);
@@ -259,7 +258,6 @@ exports.Stage = Montage.create(Component, {
             this.application.ninja.toolsData.selectedToolInstance._configure(true);
 
             this.addEventListener("change@appModel.show3dGrid", this, false);
-
         }
     },
 
@@ -360,6 +358,16 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
+    handleMousewheel: {
+        value: function(event) {
+            if(event._event.wheelDelta > 0) {
+                this._iframeContainer.scrollTop -= 20;
+            } else {
+                this._iframeContainer.scrollTop += 20;
+            }
+        }
+    },
+
     /**
      * Enables the MouseMove on Canvas
      */
@@ -522,8 +530,7 @@ exports.Stage = Montage.create(Component, {
             drawUtils.updatePlanes();
 
             //TODO Set this variable in the needs draw so that it does not have to be calculated again for each draw for selection change
-            if(this.application.ninja.selectedElements.length)
-            {
+            if(this.application.ninja.selectedElements.length) {
                 // drawUtils.drawSelectionBounds handles the single selection case as well,
                 // so we don't have to special-case the single selection case.
                 // TODO drawUtils.drawSelectionBounds expects an array of elements.
@@ -531,8 +538,7 @@ exports.Stage = Montage.create(Component, {
                 // TODO to work on _element instead of re-creating a new Array here.
                 var selArray = new Array();
 
-                for(var i = 0; this.application.ninja.selectedElements[i];i++)
-                {
+                for(var i = 0; this.application.ninja.selectedElements[i];i++) {
                     var curElement = this.application.ninja.selectedElements[i]._element;
 
                     // Add element to array that is used to calculate 3d-bounding box of all elements
@@ -565,7 +571,7 @@ exports.Stage = Montage.create(Component, {
      * @params: x, y, w, h
      */
     draw3DSelectionRectangle: {
-        value:function(x0,y0, x1,y1, x2,y2, x3,y3){
+        value:function(x0,y0, x1,y1, x2,y2, x3,y3) {
 //            this.clearCanvas();
             this.clearDrawingCanvas();
             this._drawingContext.strokeStyle = this._canvasDrawingPrefs.color;
@@ -610,7 +616,7 @@ exports.Stage = Montage.create(Component, {
      * Draws selection highlight and reg. point for a given element
      */
     drawElementBoundingBox: {
-        value: function(elt, editMode) {
+        value: function(elt) {
             this.stageDeps.viewUtils.setViewportObj( elt );
             var bounds3D = this.stageDeps.viewUtils.getElementViewBounds3D( elt );
 
@@ -621,18 +627,16 @@ exports.Stage = Montage.create(Component, {
 //            }
 
             var zoomFactor = 1;
-            if (this._viewport.style && this._viewport.style.zoom)
-            {
+            if (this._viewport.style && this._viewport.style.zoom) {
                                 zoomFactor = Number(this._viewport.style.zoom);
             }
+
             var tmpMat = this.stageDeps.viewUtils.getLocalToGlobalMatrix( elt );
-            for (var j=0;  j<4;  j++)
-            {
+            for (var j=0;  j<4;  j++) {
                 var localPt = bounds3D[j];
                 var tmpPt = this.stageDeps.viewUtils.localToGlobal2(localPt, tmpMat);
 
-                if(zoomFactor !== 1)
-                {
+                if(zoomFactor !== 1) {
                     tmpPt = vecUtils.vecScale(3, tmpPt, zoomFactor);
 
                     tmpPt[0] += this._scrollLeft*(zoomFactor - 1);
@@ -642,13 +646,9 @@ exports.Stage = Montage.create(Component, {
             }
 
             // draw it
-            if(editMode) {
-                this.context.strokeStyle = this._editSymbolPrefs.color;
-                this.context.lineWidth = this._editSymbolPrefs.thickness;
-            } else {
-                this.context.strokeStyle = this._canvasSelectionPrefs.color;
-                this.context.lineWidth = this._canvasSelectionPrefs.thickness;
-            }
+            this.context.strokeStyle = this._canvasSelectionPrefs.color;
+            this.context.lineWidth = this._canvasSelectionPrefs.thickness;
+
 
             this.context.beginPath();
 
@@ -662,13 +662,6 @@ exports.Stage = Montage.create(Component, {
 
             this.context.closePath();