Merge branch 'refs/heads/master' into text-tool

16 files changed, 272 insertions, 88 deletions

diff --git a/js/components/colorwheel.reel/compass_app_log.txt b/js/components/colorwheel.reel/compass_app_log.txt
deleted file mode 100644
index 815feb02..00000000
--- a/js/components/colorwheel.reel/compass_app_log.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-2011-11-23 01:07:12    create css/colorwheel.css
-2011-11-23 01:07:25 overwrite css/colorwheel.css
-2011-12-20 17:04:05 overwrite css/colorwheel.css
diff --git a/js/components/popup.reel/compass_app_log.txt b/js/components/popup.reel/compass_app_log.txt
deleted file mode 100644
index 8a3fb984..00000000
--- a/js/components/popup.reel/compass_app_log.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-2011-06-28 18:13:06    create css/popup.css
-2011-06-28 18:13:12 identical css/popup.css
-2011-06-28 18:14:08 overwrite css/popup.css
-2011-06-28 18:14:20 overwrite css/popup.css
-2011-06-28 18:14:29 overwrite css/popup.css
-2011-06-28 18:17:23 overwrite css/popup.css
-2011-06-28 18:17:27 overwrite css/popup.css
-2011-06-28 18:17:56 overwrite css/popup.css
-2011-06-28 18:18:09 overwrite css/popup.css
-2011-06-28 18:20:30 overwrite css/popup.css
-2011-06-28 18:22:35 overwrite css/popup.css
-2011-06-28 18:24:12 overwrite css/popup.css
-2011-06-28 18:24:23 overwrite css/popup.css
-2011-06-28 18:24:33 overwrite css/popup.css
-2011-06-28 18:25:17 overwrite css/popup.css
-2011-06-28 18:26:21 overwrite css/popup.css
-2011-06-28 18:26:33 overwrite css/popup.css
-2011-06-28 18:26:42 overwrite css/popup.css
-2011-06-28 18:26:57 overwrite css/popup.css
-2011-06-28 18:29:57 overwrite css/popup.css
-2011-06-28 18:30:14 overwrite css/popup.css
-2011-06-28 18:30:23 overwrite css/popup.css
-2011-06-28 18:30:48 overwrite css/popup.css
-2011-06-28 18:31:03 overwrite css/popup.css
-2011-06-29 10:18:31 overwrite css/popup.css
-2011-06-29 10:18:47 overwrite css/popup.css
-2011-06-29 10:37:19 overwrite css/popup.css
-2011-06-29 10:40:29 overwrite css/popup.css
-2011-06-29 10:45:37 overwrite css/popup.css
-2011-06-29 10:45:53 identical css/popup.css
-2011-06-29 10:46:52 overwrite css/popup.css
-2011-06-29 10:47:02 identical css/popup.css
-2011-06-29 13:30:47 overwrite css/popup.css
-2011-06-29 13:31:14 overwrite css/popup.css
-2011-12-20 17:06:48 overwrite css/popup.css
-2011-12-22 11:29:15 overwrite css/popup.css
-2011-12-22 11:29:24 identical css/popup.css
-2011-12-22 11:30:05 overwrite css/popup.css
-2011-12-22 11:30:33 overwrite css/popup.css
-2011-12-22 11:30:51 overwrite css/popup.css
-2011-12-22 11:32:30 overwrite css/popup.css
-2011-12-22 11:33:06 overwrite css/popup.css
-2011-12-22 11:33:12 overwrite css/popup.css
-2011-12-22 11:33:32 identical css/popup.css
-2011-12-22 11:33:36 overwrite css/popup.css
-2011-12-22 11:34:48 overwrite css/popup.css
-2012-01-26 11:42:18 overwrite css/popup.css
-2012-01-26 11:42:20 overwrite css/popup.css
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 4d557a94..13f1c575 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -110,7 +110,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "name": "Repetition",
             "properties": {
                 "element": { "#": "branchList" },
-                "contentController": {"@": "arrayController" }
+                "contentController": {"@": "arrayController" },
+                "selectionEnabled": true
             }
         },
 
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.js b/js/components/treeview/ninja-branch.reel/ninja-branch.js
index 6b9ebb10..0d1a1d0e 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.js
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.js
@@ -5,7 +5,6 @@
  </copyright> */
 
 var Montage = require("montage").Montage,
-    Component = require("montage/ui/component").Component,
     TreeNode = require("js/components/treeview/tree-node").TreeNode;
 
 var Branch = exports.Branch = Montage.create(TreeNode, {
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
index bd8e8acd..310274bc 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
@@ -37,7 +37,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </head>
 <body>
     <div id="leaf" class="leaf">
-        <div id="label" class="leaf-label"></div>
+        <div id="label" class="leaf-label" draggable="true"></div>
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
index bd566b26..0b7a171e 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -5,7 +5,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage   = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
     TreeNode = require("js/components/treeview/tree-node").TreeNode;
 
 exports.Leaf = Montage.create(TreeNode, {
@@ -14,19 +13,38 @@ exports.Leaf = Montage.create(TreeNode, {
     },
     templateDidLoad : {
         value: function() {
-            this.needsDraw = true;
+            var event = this.treeView.activationEvent;
+
+            ///// Re-set the activation event
+            if(event && event !== this.activationEvent) {
+                this.delegateEventMap[event] = this.delegateEventMap[this.activationEvent];
+                delete this.delegateEventMap[this.activationEvent];
+                this.activationEvent = this.treeView.activationEvent;
+            }
         }
     },
     prepareForDraw: {
         value : function() {
-            this.activationEvent = this.activationEvent || 'click';
-            this.label._element.addEventListener(this.activationEvent, this.handleNodeActivation.bind(this), false);
+            var el = this.label._element;
+
+            Object.keys(this.delegateEventMap).forEach(function(event) {
+                el.addEventListener(event, this, false);
+            }, this);
+
         }
     },
-    handleNodeActivation: {
+    handleEvent : {
         value: function(e) {
-            console.log(this.sourceObject);
-            this.treeView.contentController.delegate.applyPresetSelection(this.sourceObject);
+            var delegateMethod = this.delegateEventMap[e._event.type];
+            this.callDelegateMethod(delegateMethod);
+        }
+    },
+    callDelegateMethod : {
+        value: function(methodName) {
+            var delegate = this.treeView.contentController.delegate;
+            if(delegate && typeof delegate[methodName] === 'function') {
+                delegate[methodName](this.sourceObject);
+            }
         }
     },
     draw : {
@@ -35,6 +53,16 @@ exports.Leaf = Montage.create(TreeNode, {
                 this._labelText = this.sourceObject[this.labelKey];
             }
         }
+    },
+    activationEvent : {
+        value : 'click'
+    },
+    delegateEventMap : {
+        value: {
+            'click'     : 'handleNodeActivation',
+            'dragstart' : 'handleDragStart',
+            'dragend'   : 'handleDragEnd'
+        }
     }
 
 
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index 5bef7020..e51bdd8a 100644
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -9,32 +9,80 @@ var Montage = require("montage/core/core").Montage,
 
 var ColorChip = exports.ColorChip = Montage.create(Component, {
 
+    chip: {
+        value: false
+    },
+
     hasIcon: {
         value: true