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/data/pi/pi-data.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/data/pi/pi-data.js

(limited to 'js/data/pi/pi-data.js')

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 9e40945a5bf4330d1088b56b8011ee625b1adab9 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 10 Feb 2012 10:23:48 -0800
Subject: Support export/import of GLLine data.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/data/pi/pi-data.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'js/data/pi/pi-data.js')

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 10b33a0e..8ffd0ec7 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -459,12 +459,14 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type: "dropdown",
-                            id:   "stroke",
+                            id:   "strokeMaterial",
+                            prop:   "strokeMaterial",
                             label: "Stroke",
                             labelField: "_name",
                             dataField: "_name",
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
-                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
+                            divider : true
                         }
                     ]
                 ]
-- 
cgit v1.2.3


From a30d76ff641ce89686cf5fbd9f04ac9ab4e9c830 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 10 Feb 2012 17:21:28 -0800
Subject: initial color chip for the stage

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/data/pi/pi-data.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'js/data/pi/pi-data.js')

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 10b33a0e..a6811a20 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -10,7 +10,21 @@ var Montage = require("montage/core/core").Montage,
 exports.PiData = Montage.create( Montage, {
 
     stagePi: {
-        value: []
+        value: [
+            {
+                label: "Style",
+
+                Section: [
+                    [
+                        {
+                            type : "chip",
+                            id : "background",
+                            prop: "background"
+                        }
+                    ]
+                ]
+            }
+        ]
     },
 
     blockPi: {
-- 
cgit v1.2.3