Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

2 files changed, 26 insertions, 4 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 675176e9..53588f68 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -11,6 +11,9 @@ exports.ElementController = Montage.create(Component, {
 
     addElement: {
         value: function(el, styles) {
+        
+                if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
+                
                 // Updated to use new methods in TimelinePanel. JR.
                 var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
                 if (insertionIndex === false) {
@@ -179,8 +182,6 @@ exports.ElementController = Montage.create(Component, {
                             el.elementModel.stroke = null;
                             return;
                         case 'gradient':
-                            this.setProperty(el, "border-image", color.color.css);
-                            this.setProperty(el, "border-color", "none");
                             if(color.borderInfo) {
                                 if(color.borderInfo.borderWidth) {
                                     this.setProperty(el, "border-width", color.borderInfo.borderWidth + color.borderInfo.borderUnits);
@@ -189,9 +190,11 @@ exports.ElementController = Montage.create(Component, {
                                     this.setProperty(el, "border-style", color.borderInfo.borderStyle);
                                 }
                             }
+                            this.setGradientBorder(el, color.color.gradientMode, color.color.css);
                             break;
                         default:
                             this.setProperty(el, "border-image", "none");
+                            this.setProperty(el, "border-image-slice", "");
                             this.setProperty(el, "border-color", color.color.css);
                             if(color.borderInfo) {
                                 if(color.borderInfo.borderWidth) {
@@ -208,6 +211,25 @@ exports.ElementController = Montage.create(Component, {
         }
     },
 
+    setGradientBorder: {
+        value: function(el, gradientMode, css) {
+            if(gradientMode === "radial") {
+                this.setProperty(el, "border-image", css.replace("ellipse", "circle"));
+            } else {
+                this.setProperty(el, "border-image", css);
+            }
+            this.setProperty(el, "border-color", "none");
+            // gradient slice = borderWidth/totalWidth
+            var b = parseInt(this.getProperty(el, "border-left-width", true)),
+                w = parseInt(this.getProperty(el, "width", true)),
+                h = parseInt(this.getProperty(el, "height", true));
+            if(h > w) {
+                w = h;
+            }
+            this.setProperty(el, "border-image-slice", Math.floor(b/(w+b+b) * 100) + "%");
+        }
+    },
+
     getStroke: {
         value: function(el) {
             // TODO - Need to figure out which border side user wants
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 38f133b5..626dedb6 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -213,7 +213,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 default:
                     CanvasController.setProperty(el, p, value);
             }
-            this.application.ninja.documentController.activeDocument.model.needsSave = true;
+            this.application.ninja.currentDocument.model.needsSave = true;
         }
     },
 
@@ -559,7 +559,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 }
             }
             el.elementModel.shapeModel.GLWorld.render();
-            this.application.ninja.documentController.activeDocument.model.needsSave = true;
+            this.application.ninja.currentDocument.model.needsSave = true;
         }
     },