From 1433f2bdf2e5b8c5c18fed5e9c17fd983ab3606d Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Fri, 2 Mar 2012 10:55:51 -0800
Subject: CSS Panel - Updating components, created toolbar components, and
small changes to styles controller
---
js/components/toolbar.reel/toolbar.html | 34 +++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 js/components/toolbar.reel/toolbar.html
(limited to 'js/components/toolbar.reel/toolbar.html')
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
new file mode 100644
index 00000000..8ccce126
--- /dev/null
+++ b/js/components/toolbar.reel/toolbar.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- <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> -->
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <link href="toolbar.css" rel="stylesheet" type="text/css">
+ <script type="text/montage-serialization">
+ {
+ "owner": {
+ "module" : "js/panels/css-panel/style-sheet.reel",
+ "name" : "StyleSheet",
+ "properties" : {
+ "element" : {"#" : "toolbar-container"}
+ }
+ },
+ "button": {
+ "module": "js/components/button.reel",
+ "name": "Button",
+ "properties": {
+
+ }
+ }
+ }
+ </script>
+</head>
+<body>
+<div id="toolbar-container" class="toolbar-container">
+</div>
+</body>
+</html>
\ No newline at end of file
--
cgit v1.2.3
From 30e3f3d6c19025c37694127ac148146277681994 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Tue, 3 Apr 2012 14:43:52 -0700
Subject: CSS Panel - Stylesheet edit mode
---
js/components/toolbar.reel/toolbar.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/components/toolbar.reel/toolbar.html')
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index 8ccce126..69eba194 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -18,7 +18,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
}
},
"button": {
- "module": "js/components/button.reel",
+ "module": "montage/ui/button.reel",
"name": "Button",
"properties": {
--
cgit v1.2.3
From 4cefebd99813f05713deb2f72bba0a035dfcb508 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Mon, 23 Apr 2012 11:46:54 -0700
Subject: Toolbar - Add buttons to toolbar component
---
js/components/toolbar.reel/toolbar.html | 43 +++++++++++++++++++++++++++++++--
1 file changed, 41 insertions(+), 2 deletions(-)
(limited to 'js/components/toolbar.reel/toolbar.html')
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index 69eba194..53c6627a 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -14,14 +14,50 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
"module" : "js/panels/css-panel/style-sheet.reel",
"name" : "StyleSheet",
"properties" : {
- "element" : {"#" : "toolbar-container"}
+ "element" : {"#" : "toolbar-container"},
+ "repetition": {"@": "buttonList" }
}
},
+
+ "buttonList": {
+ "module": "montage/ui/repetition.reel",
+ "name": "Repetition",
+ "properties": {
+ "element": {"#": "repetition"}
+ },
+ "bindings": {
+ "objects" : {
+ "boundObject": {"@": "owner"},
+ "boundObjectPropertyPath": "buttons",
+ "oneway": true
+ }
+
+ }
+ },
+
"button": {
"module": "montage/ui/button.reel",
"name": "Button",
"properties": {
-
+ "element": {"#": "button" },
+ "label": " "
+ },
+ "bindings": {
+ "label" : {
+ "boundObject": {"@": "buttonList"},
+ "boundObjectPropertyPath": "objectAtCurrentIteration.title",
+ "oneway": true
+ },
+ "identifier": {
+ "boundObject": {"@": "buttonList"},
+ "boundObjectPropertyPath": "objectAtCurrentIteration.identifier",
+ "oneway": true
+ },
+ "sourceObject": {
+ "boundObject": {"@": "buttonList"},
+ "boundObjectPropertyPath": "objectAtCurrentIteration",
+ "oneway": true
+ }
}
}
}
@@ -29,6 +65,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
</head>
<body>
<div id="toolbar-container" class="toolbar-container">
+ <ul data-montage-id="repetition">
+ <li><button data-montage-id="button" class="toolbar-button"></button></li>
+ </ul>
</div>
</body>
</html>
\ No newline at end of file
--
cgit v1.2.3
From a8e97144c832e355de7f8177ce38644119248e87 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Mon, 21 May 2012 09:30:24 -0700
Subject: Style sheets view - Fixed drawing of toolbar and "no sheets" message
---
js/components/toolbar.reel/toolbar.html | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
(limited to 'js/components/toolbar.reel/toolbar.html')
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index 53c6627a..b33c4665 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -11,8 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
<script type="text/montage-serialization">
{
"owner": {
- "module" : "js/panels/css-panel/style-sheet.reel",
- "name" : "StyleSheet",
+ "prototype" : "js/components/toolbar.reel",
"properties" : {
"element" : {"#" : "toolbar-container"},
"repetition": {"@": "buttonList" }
@@ -36,8 +35,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
},
"button": {
- "module": "montage/ui/button.reel",
- "name": "Button",
+ "prototype": "montage/ui/button.reel",
"properties": {
"element": {"#": "button" },
"label": " "
@@ -64,7 +62,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
</script>
</head>
<body>
-<div id="toolbar-container" class="toolbar-container">
+<div data-montage-id="toolbar-container" class="toolbar-container">
<ul data-montage-id="repetition">
<li><button data-montage-id="button" class="toolbar-button"></button></li>
</ul>
--
cgit v1.2.3
From 1c3da2901f454ad2c18e20216bb2517740a1c080 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Tue, 22 May 2012 14:28:00 -0700
Subject: CSS Panel - Update components to use new serialization format
---
js/components/toolbar.reel/toolbar.html | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
(limited to 'js/components/toolbar.reel/toolbar.html')
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index b33c4665..d2c5972a 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -25,12 +25,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
"element": {"#": "repetition"}
},
"bindings": {
- "objects" : {
- "boundObject": {"@": "owner"},
- "boundObjectPropertyPath": "buttons",
- "oneway": true
- }
-
+ "objects": {"<-": "@owner.buttons"}
}
},
@@ -41,21 +36,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
"label": " "
},
"bindings": {
- "label" : {
- "boundObject": {"@": "buttonList"},
- "boundObjectPropertyPath": "objectAtCurrentIteration.title",
- "oneway": true
- },
- "identifier": {
- "boundObject": {"@": "buttonList"},
- "boundObjectPropertyPath": "objectAtCurrentIteration.identifier",
- "oneway": true
- },
- "sourceObject": {
- "boundObject": {"@": "buttonList"},
- "boundObjectPropertyPath": "objectAtCurrentIteration",
- "oneway": true
- }
+ "label": {"<-": "@buttonList.objectAtCurrentIteration.title"},
+ "sourceObject": {"<-": "@buttonList.objectAtCurrentIteration"}
}
}
}
--
cgit v1.2.3
From 26683016ea28aac61e7c563df769dfafe40dce12 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 30 May 2012 09:19:25 -0700
Subject: CSS Panel Toolbar - Prevent warning regarding undefined sourceObject
---
js/components/toolbar.reel/toolbar.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/components/toolbar.reel/toolbar.html')
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index d2c5972a..51e7ebec 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -30,7 +30,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
},
"button": {
- "prototype": "montage/ui/button.reel",
+ "prototype": "js/components/toolbar.reel/toolbar-button",
"properties": {
"element": {"#": "button" },
"label": " "
--
cgit v1.2.3