From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/components/layout/tools-list.reel/tools-list.css  | 0
 js/components/layout/tools-list.reel/tools-list.html | 0
 js/components/layout/tools-list.reel/tools-list.js   | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/components/layout/tools-list.reel/tools-list.css
 mode change 100644 => 100755 js/components/layout/tools-list.reel/tools-list.html
 mode change 100644 => 100755 js/components/layout/tools-list.reel/tools-list.js

(limited to 'js/components/layout/tools-list.reel')

diff --git a/js/components/layout/tools-list.reel/tools-list.css b/js/components/layout/tools-list.reel/tools-list.css
old mode 100644
new mode 100755
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
old mode 100644
new mode 100755
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From bb4da39a73cbd6fbe83f3b7c9ed5ae60fe58dd6b Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Wed, 15 Feb 2012 14:23:19 -0800
Subject: Tool Icons : New layout

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/components/layout/tools-list.reel/tools-list.html | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'js/components/layout/tools-list.reel')

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index e12fd59b..c47359bf 100644
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -25,6 +25,21 @@
                 }
             },
 
+            "groupLine": {
+                "module": "js/components/layout/tool-button.reel",
+                "name": "ToolButton",
+                "properties": {
+                    "element": {"#": "groupLine"}
+                },
+                "bindings": {
+                    "data": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration",
+                        "oneway": true
+                    }
+                }
+            },
+
             "repetition1": {
                 "module": "montage/ui/repetition.reel",
                 "name": "Repetition",
@@ -163,9 +178,9 @@
         <div id="toolsList" class="toolsList">
             <div id="toolscontainer" class="toolscontainer">
                 <div id="toolbutton" class="toolbutton"></div>
+                <hr id="groupLine" />
             </div>
             <!-- TODO: Remove and add as a component -->
-            <hr class="toolbar_hr" />
             <div id="colortoolbar"></div>
         </div>
 
-- 
cgit v1.2.3


From 92873714dd6ffb259e6c5a27da2ade773d7b00f9 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Wed, 15 Feb 2012 15:04:37 -0800
Subject: New Icons: Last set had imperfections

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/components/layout/tools-list.reel/tools-list.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'js/components/layout/tools-list.reel')

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index c47359bf..2c5617e5 100644
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -26,15 +26,15 @@
             },
 
             "groupLine": {
-                "module": "js/components/layout/tool-button.reel",
-                "name": "ToolButton",
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
                 "properties": {
                     "element": {"#": "groupLine"}
                 },
                 "bindings": {
-                    "data": {
+                    "condition": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
                         "oneway": true
                     }
                 }
@@ -178,7 +178,9 @@
         <div id="toolsList" class="toolsList">
             <div id="toolscontainer" class="toolscontainer">
                 <div id="toolbutton" class="toolbutton"></div>
-                <hr id="groupLine" />
+                <div id="groupLine">
+                    <hr />
+                </div>
             </div>
             <!-- TODO: Remove and add as a component -->
             <div id="colortoolbar"></div>
-- 
cgit v1.2.3