Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

3 files changed, 12 insertions, 2 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index ae9260fc..a096848e 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -156,7 +156,7 @@ exports.Layout = Montage.create(Component, {
     drawTagOutline: {
         value: function (item) {
 
-            if(!item) return;
+            if(!item || (item.nodeType !== 1)) return;
 
             // TODO Bind the layoutview mode to the current document
             // var mode  = this.application.ninja.currentDocument.layoutMode;
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 3500b6a3..ec8c0e55 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -795,6 +795,8 @@ exports.Stage = Montage.create(Component, {
     drawLine: {
         value:function(x0, y0, x1, y1, strokeSize, strokeColor) {
             this.clearDrawingCanvas();
+            var origStrokeStyle = this._drawingContext.strokeStyle;
+            var origLineWidth = this._drawingContext.lineWidth;
             this._drawingContext.strokeStyle = strokeColor;
             this._drawingContext.lineWidth = strokeSize;
 
@@ -825,6 +827,9 @@ exports.Stage = Montage.create(Component, {
             var w = Math.round(Math.abs(x1-x0));
             this._drawingContext.fillText("H: " + h, txtX + 38, txtY - 4);
             this._drawingContext.fillText("W: " + w, txtX - 5, txtY + 12);
+
+            this._drawingContext.strokeStyle = origStrokeStyle;
+            this._drawingContext.lineWidth = origLineWidth;
         }
     },
 
diff --git a/js/stage/tool-handle.js b/js/stage/tool-handle.js
index f16d8324..d353da47 100755
--- a/js/stage/tool-handle.js
+++ b/js/stage/tool-handle.js
@@ -235,6 +235,8 @@ exports.RotateHandle = Montage.create(ToolHandle, {
             context.strokeStyle = this._strokeStyle;
             context.fillStyle = this._fillStyle;
             context.lineWidth = this._lineWidth;
+            context.shadowBlur = 2;
+            context.shadowColor = "rgba(0, 0, 0, 0.8)";
 
             var pointOnElt = base.slice(0);
 //            this._origin = viewUtils.localToGlobal(pointOnElt, item);
@@ -400,7 +402,8 @@ exports.RotateHandle = Montage.create(ToolHandle, {
             var context = this.application.ninja.stage.drawingContext;
             context.save();
 
-            context.strokeStyle = this._strokeStyle;
+            context.strokeStyle = "rgba(0,0,0,1)";
+            context.lineWidth = 2;
             context.fillStyle = this._fillStyle;
             context.globalAlpha = 0.2;
 
@@ -574,6 +577,8 @@ exports.TranslateHandle = Montage.create(ToolHandle, {
             context.strokeStyle = this._strokeStyle;
             context.fillStyle = this._fillStyle;
             context.lineWidth = this._lineWidth;
+            context.shadowBlur = 2;
+            context.shadowColor = "rgba(0, 0, 0, 0.8)";
 
             var pointOnElt = base.slice(0);
 //            this._origin = viewUtils.localToGlobal(pointOnElt, item);