Merge branch 'brushtool' into pentool

17 files changed, 372 insertions, 175 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index dcfd471c..26a56b45 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -4,14 +4,20 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-.breadcrumbTrail{
+.breadcrumbTrail {
+
     background-color: #282828;
-    border-style: double;
     height: 26px;
     position:relative;
     -webkit-box-flex: 0;
 }
 
+.mainContentContainer > section.breadcrumbTrail {
+    border:0;
+    margin:0;
+    border-bottom:1px solid #000;
+    margin-bottom:1px;
+}
 .breadcrumbTrail button.nj-skinned {
     float: left;
     width: 60px;
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
new file mode 100644
index 00000000..7152ba93
--- /dev/null
+++ b/js/controllers/presets-controller.js
@@ -0,0 +1,108 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.PresetsController = Montage.create(Component, {
+
+    hasTemplate : {
+        value: false
+    },
+
+    transitionClass : {
+        value : "nj-preset-transition"
+    },
+
+    addTransition: {
+        value: function(element) {
+            element.classList.add(this.transitionClass);
+            element.addEventListener("webkitTransitionEnd", this, true);
+        }
+    },
+
+    captureWebkitTransitionEnd : {
+        value : function(e) {
+            var el = e.target;
+            el.classList.remove(this.transitionClass);
+            el.removeEventListener("webkitTransitionEnd", this, true);
+        }
+    },
+
+    applyPreset : {
+        value: function(presetData, useTransition) {
+            var selection = this.application.ninja.selectedElements;
+
+            if(!selection || !selection.length || selection.length === 0) { return false; }
+
+            var stylesController = this.application.ninja.stylesController,
+                selectorBase = presetData.selectorBase,
+                rules = [];
+
+            selectorBase = stylesController.generateClassName(selectorBase);
+
+            presetData.rules.forEach(function(rule, i) {
+                ///// Treat keyframed rules differently
+                if(rule.isKeyFrameRule) {
+                    this.application.ninja.stylesController.addRule(
+                        '@-webkit-keyframes ' + presetData.selectorBase,
+                        this.stringifyKeys(rule.keys)
+                    );
+                } else {
+                    var suffix = rule.selectorSuffix || '';
+                    rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
+                }
+            }, this);
+
+            selection.forEach(function(element) {
+                var el = element._element;
+
+                if(useTransition) {
+                    this.addTransition(el);
+                }
+
+                el.classList.add(selectorBase);
+
+                //// Keep track of elements with presets and don't add duplicates
+                this.setCachedPreset(el, presetData.id, rules);
+
+            }, this);
+
+        }
+    },
+
+    setCachedPreset : {
+        value: function(el, presetId, rules) {
+
+        }
+    },
+
+    getPresets : {
+        value: function(element) {
+
+        }
+
+    },
+
+    stringifyKeys : {
+        value: function(keysArray) {
+            var keysString = '';
+
+            keysArray.forEach(function(key) {
+                var styles = '', style;
+
+                for(style in key.styles) {
+                    styles += style + ':' + key.styles[style] + '; ';
+                }
+
+                keysString += key.keyText + ' {' + styles + ' }';
+            });
+
+            return keysString;
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 68300edf..6c2b415f 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -72,4 +72,8 @@ body
 
 .elem-red-outline {
   outline: red solid thin;
+}
+
+.nj-preset-transition {
+    -webkit-transition: all 450ms linear !important;
 }
\ No newline at end of file
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index d849e3d7..22209815 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -545,8 +545,8 @@ var BrushStroke = function GLBrushStroke() {
             var newLeft = Math.round(this._stageWorldCenter[0] - 0.5 * bboxWidth);
             var newTop = Math.round(this._stageWorldCenter[1] - 0.5 * bboxHeight);
             //assign the new position, width, and height as the canvas dimensions through the canvas controller
-            CanvasController.setProperty(this._canvas, "left", newLeft+"px");
-            CanvasController.setProperty(this._canvas, "top", newTop+"px");
+            //CanvasController.setProperty(this._canvas, "left", newLeft+"px");
+            //CanvasController.setProperty(this._canvas, "top", newTop+"px");
 
             CanvasController.setProperty(this._canvas, "width", bboxWidth+"px");
             CanvasController.setProperty(this._canvas, "height", bboxHeight+"px");
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index f9e1efdd..ead7f576 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -77,34 +77,83 @@
                 "name": "Splitter",
                 "properties": {
                     "element": {"#": "bottomSplitter"},
-                    "panel": {"#": "bottomPanelContainer"},
-                    "resizeBar": {"#": "timelineResizer"}
+                    "panel": {"@": "timeline"}
                 }
             },
 
             "resizer1": {
-                "module": "js/panels/Resizer",
-                "name": "Resizer",
+                "module": "js/panels/resize-composer",
+                "name": "ResizeComposer",
                 "properties": {
                     "element": {"#": "rightPanelResizer"},
-                    "id": "rightPanelResizer",
-                    "panel": {"#": "rightPanelContainer"},
-                    "isVertical": false,
-                    "redrawStage": true
-                }
+                    "component": {"@": "owner"},
+                    "yAxis": false
+                },
+                "listeners": [
+                    {
+                        "type": "resizeStart",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeMove",
+                        "listener": {"@": "owner"}
+                    },