From b3bc7a02218ff0c2eacde5d68d76c47574e534bc Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 27 Apr 2012 15:07:31 -0700
Subject: Timeline: Replace id with data-montage-id in all reels.

---
 js/panels/Timeline/Style.reel/Style.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'js/panels/Timeline/Style.reel')

diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 9fb098de..5be159c3 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -65,23 +65,23 @@
         </script>
 	</head>
 	<body>
-		<div id="style-container">
+		<div data-montage-id="style-container">
 			<div class="style-padding">
 				<div class="row-hintable hidden">
-					<div id="style-hintable"></div>
+					<div data-montage-id="style-hintable"></div>
 				</div>
 				<div class="container-propvals hidden">
 					<div class="cell-property">
-						<div id="container-property">property</div>
+						<div data-montage-id="container-property">property</div>
 					</div>
 					<div class="cell-value value-editor editor-hottext hidden">
-						<div id="value-editor-hottext"></div>
+						<div data-montage-id="value-editor-hottext"></div>
 					</div>
 					<div class="cell-value value-editor editor-color hidden">
-						<div id="value-editor-color">[&nbsp;]</div>
+						<div data-montage-id="value-editor-color">[&nbsp;]</div>
 					</div>
 					<div class="cell-value value-editor editor-input hidden">
-						<!-- <div id="value-editor-input"></div> -->
+						<!-- <div data-montage-id="value-editor-input"></div> -->
 						<input type="text" class="nj-skinned" value="" />
 					</div>
 				</div>
-- 
cgit v1.2.3


From a8ad82e6595b75838305eb4fa83385a42053ffd6 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 30 Apr 2012 16:00:41 -0700
Subject: Timeline: Change serialization parameters for some component
 properties.

---
 js/panels/Timeline/Style.reel/Style.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'js/panels/Timeline/Style.reel')

diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 027f3a40..c39f3a56 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -27,7 +27,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     /* === BEGIN: Models === */
 	// isSelected: whether or not the style is selected
 	_isSelected: {
-		serializable: true,
 		value: false
 	},
 	isSelected: {
@@ -60,7 +59,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
    
    // Property for this editor
     _editorProperty: {
-    	serializable: true,
     	value: ""
     },
     editorProperty: {
@@ -76,7 +74,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     
     // Value for the property for this editor.
     _editorValue: {
-    	serializable: true,
     	value: ""
     },
     editorValue: {
@@ -92,7 +89,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     
 	// The tweener used to change the value for this property. 
     _ruleTweener: {
-    	serializable: true,
     	value: false
     },
     ruleTweener: {
@@ -137,7 +133,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     
     // whichView: which view should we show: hintable or propval
     _whichView : {
-    	serializable: true,
     	value: "hintable"
     },
     whichView: {
@@ -161,7 +156,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
  	// styleID: the id for this style;
  	// Used to publish events
  	_styleID : {
- 		serializable: true,
  		value: null
  	},
  	styleID: {
-- 
cgit v1.2.3