aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-ximages/optionsbar/selection/AlignLeft.png (renamed from images/optionsbar/selection/alignLeft.png)bin2847 -> 2847 bytes
-rwxr-xr-ximages/optionsbar/selection/AlignRight.png (renamed from images/optionsbar/selection/alignRight.png)bin2851 -> 2851 bytes
-rwxr-xr-ximages/optionsbar/selection/AlignTop.png (renamed from images/optionsbar/selection/alignTop.png)bin2856 -> 2856 bytes
-rwxr-xr-ximages/optionsbar/selection/DistCenter.png (renamed from images/optionsbar/selection/distCenter.png)bin2868 -> 2868 bytes
-rwxr-xr-ximages/optionsbar/selection/DistLeft.png (renamed from images/optionsbar/selection/distLeft.png)bin2856 -> 2856 bytes
-rwxr-xr-ximages/optionsbar/selection/DistRight.png (renamed from images/optionsbar/selection/distRight.png)bin2851 -> 2851 bytes
-rwxr-xr-ximages/optionsbar/selection/DistTop.png (renamed from images/optionsbar/selection/distTop.png)bin2856 -> 2856 bytes
-rwxr-xr-xjs/components/hottext.reel/hottext.js2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html2
-rwxr-xr-xjs/components/popup.reel/popup.html2
-rwxr-xr-xjs/components/slider.reel/slider.js2
-rwxr-xr-xjs/controllers/color-controller.js6
-rw-r--r--js/data/panels-data.js2
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html6
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html8
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
19 files changed, 19 insertions, 19 deletions
diff --git a/images/optionsbar/selection/alignLeft.png b/images/optionsbar/selection/AlignLeft.png
index 822c5243..822c5243 100755
--- a/images/optionsbar/selection/alignLeft.png
+++ b/images/optionsbar/selection/AlignLeft.png
Binary files differ
diff --git a/images/optionsbar/selection/alignRight.png b/images/optionsbar/selection/AlignRight.png
index 07d6d7ef..07d6d7ef 100755
--- a/images/optionsbar/selection/alignRight.png
+++ b/images/optionsbar/selection/AlignRight.png
Binary files differ
diff --git a/images/optionsbar/selection/alignTop.png b/images/optionsbar/selection/AlignTop.png
index 378d8aab..378d8aab 100755
--- a/images/optionsbar/selection/alignTop.png
+++ b/images/optionsbar/selection/AlignTop.png
Binary files differ
diff --git a/images/optionsbar/selection/distCenter.png b/images/optionsbar/selection/DistCenter.png
index cf8f2bf5..cf8f2bf5 100755
--- a/images/optionsbar/selection/distCenter.png
+++ b/images/optionsbar/selection/DistCenter.png
Binary files differ
diff --git a/images/optionsbar/selection/distLeft.png b/images/optionsbar/selection/DistLeft.png
index 3849e9e6..3849e9e6 100755
--- a/images/optionsbar/selection/distLeft.png
+++ b/images/optionsbar/selection/DistLeft.png
Binary files differ
diff --git a/images/optionsbar/selection/distRight.png b/images/optionsbar/selection/DistRight.png
index e350b53e..e350b53e 100755
--- a/images/optionsbar/selection/distRight.png
+++ b/images/optionsbar/selection/DistRight.png
Binary files differ
diff --git a/images/optionsbar/selection/distTop.png b/images/optionsbar/selection/DistTop.png
index 1d474b3c..1d474b3c 100755
--- a/images/optionsbar/selection/distTop.png
+++ b/images/optionsbar/selection/DistTop.png
Binary files differ
diff --git a/js/components/hottext.reel/hottext.js b/js/components/hottext.reel/hottext.js
index 5db5db44..b31d1351 100755
--- a/js/components/hottext.reel/hottext.js
+++ b/js/components/hottext.reel/hottext.js
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 30</copyright> */
31 31
32var Montage = require("montage/core/core").Montage; 32var Montage = require("montage/core/core").Montage;
33var SliderBase = require("js/components/sliderbase").SliderBase; 33var SliderBase = require("js/components/SliderBase").SliderBase;
34 34
35var HotText = exports.HotText = Montage.create(SliderBase, { 35var HotText = exports.HotText = Montage.create(SliderBase, {
36 /* Allow users to specify a function to format the display. 36 /* Allow users to specify a function to format the display.
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 02d86007..f4fc985c 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -121,7 +121,7 @@ POSSIBILITY OF SUCH DAMAGE.
121 "prototype": "js/tools/ZoomTool" 121 "prototype": "js/tools/ZoomTool"
122 }, 122 },
123 "BindingTool1": { 123 "BindingTool1": {
124 "prototype": "js/tools/BindingTool" 124 "prototype": "js/tools/bindingTool"
125 }, 125 },
126 126
127 "disable": { 127 "disable": {
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index cd205687..66c91a9e 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
39 <script type="text/montage-serialization"> 39 <script type="text/montage-serialization">
40 { 40 {
41 "owner": { 41 "owner": {
42 "prototype": "js/components/Popup.reel", 42 "prototype": "js/components/popup.reel",
43 "properties": { 43 "properties": {
44 "element": {"#": "default_popup"}, 44 "element": {"#": "default_popup"},
45 "popupTooltip": {"#": "tooltip"}, 45 "popupTooltip": {"#": "tooltip"},
diff --git a/js/components/slider.reel/slider.js b/js/components/slider.reel/slider.js
index 3fbca4ef..2daa8b16 100755
--- a/js/components/slider.reel/slider.js
+++ b/js/components/slider.reel/slider.js
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 30</copyright> */
31 31
32var Montage = require("montage/core/core").Montage; 32var Montage = require("montage/core/core").Montage;
33var SliderBase = require("js/components/sliderbase").SliderBase; 33var SliderBase = require("js/components/SliderBase").SliderBase;
34 34
35var Slider = exports.Slider = Montage.create(SliderBase, { 35var Slider = exports.Slider = Montage.create(SliderBase, {
36 36
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index 4295ed4c..c746f3de 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -34,10 +34,10 @@ POSSIBILITY OF SUCH DAMAGE.
34var Montage = require("montage/core/core").Montage, 34var Montage = require("montage/core/core").Montage,
35 Component = require("montage/ui/component").Component, 35 Component = require("montage/ui/component").Component,
36 ColorModel = require("js/models/color-model").ColorModel, 36 ColorModel = require("js/models/color-model").ColorModel,
37 ColorPanelBase = require("js/panels/Color/colorpanelbase.reel").ColorPanelBase, 37 ColorPanelBase = require("js/panels/color/colorpanelbase.reel").ColorPanelBase,
38 ElementsMediator = require("js/mediators/element-mediator").ElementMediator, 38 ElementsMediator = require("js/mediators/element-mediator").ElementMediator,
39 ColorPopupManager = require("js/panels/Color/colorpopup-manager").ColorPopupManager, 39 ColorPopupManager = require("js/panels/color/colorpopup-manager").ColorPopupManager,
40 ColorButtonManager = require("js/panels/Color/colorbutton-manager").ColorButtonManager; 40 ColorButtonManager = require("js/panels/color/colorbutton-manager").ColorButtonManager;
41//////////////////////////////////////////////////////////////////////// 41////////////////////////////////////////////////////////////////////////
42//Exporting as ColorController 42//Exporting as ColorController
43exports.ColorController = Montage.create(Component, { 43exports.ColorController = Montage.create(Component, {
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 0db6349c..96bbe27c 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -45,7 +45,7 @@ exports.PanelsData = Montage.create(Montage, {
45 scrollable: false, 45 scrollable: false,
46 collapsed: false, 46 collapsed: false,
47 open: true, 47 open: true,
48 modulePath: "js/panels/Color/colorpanelbase.reel", 48 modulePath: "js/panels/color/colorpanelbase.reel",
49 moduleName: "ColorPanelBase" 49 moduleName: "ColorPanelBase"
50 }, 50 },
51 { 51 {
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index f83ab20b..7e2a2006 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -219,7 +219,7 @@ POSSIBILITY OF SUCH DAMAGE.
219 }, 219 },
220 220
221 "mainCollapser" : { 221 "mainCollapser" : {
222 "prototype" : "js/panels/timeline/Collapser", 222 "prototype" : "js/panels/Timeline/Collapser",
223 "properties" : { 223 "properties" : {
224 "element" : {"#" : "content-main"}, 224 "element" : {"#" : "content-main"},
225 "myContent" : {"#" : "content-main"}, 225 "myContent" : {"#" : "content-main"},
@@ -239,7 +239,7 @@ POSSIBILITY OF SUCH DAMAGE.
239 }, 239 },
240 240
241 "positionCollapser" : { 241 "positionCollapser" : {
242 "prototype" : "js/panels/timeline/Collapser", 242 "prototype" : "js/panels/Timeline/Collapser",
243 "properties" : { 243 "properties" : {
244 "element" : {"#" : "content-position"}, 244 "element" : {"#" : "content-position"},
245 "myContent" : {"#":"content-position"}, 245 "myContent" : {"#":"content-position"},
@@ -259,7 +259,7 @@ POSSIBILITY OF SUCH DAMAGE.
259 }, 259 },
260 260
261 "styleCollapser" : { 261 "styleCollapser" : {
262 "prototype" : "js/panels/timeline/Collapser", 262 "prototype" : "js/panels/Timeline/Collapser",
263 "properties" : { 263 "properties" : {
264 "element" : {"#" : "content-style"}, 264 "element" : {"#" : "content-style"},
265 "myContent" : {"#":"content-style"}, 265 "myContent" : {"#":"content-style"},
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
index af623da1..952a0f3b 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -45,7 +45,7 @@ POSSIBILITY OF SUCH DAMAGE.
45 }, 45 },
46 46
47 "propTween" : { 47 "propTween" : {
48 "prototype" : "js/panels/timeline/Tween.reel", 48 "prototype" : "js/panels/Timeline/Tween.reel",
49 "properties" : { 49 "properties" : {
50 "element":{"#": "prop_track_lane"} 50 "element":{"#": "prop_track_lane"}
51 }, 51 },
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 4dc27f57..843f0dcb 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -51,7 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.
51 }, 51 },
52 52
53 "tween" : { 53 "tween" : {
54 "prototype" : "js/panels/timeline/Tween.reel", 54 "prototype" : "js/panels/Timeline/Tween.reel",
55 "properties" : { 55 "properties" : {
56 "element":{"#": "track_lane"} 56 "element":{"#": "track_lane"}
57 }, 57 },
@@ -134,7 +134,7 @@ POSSIBILITY OF SUCH DAMAGE.
134 }, 134 },
135 135
136 "mainCollapser" : { 136 "mainCollapser" : {
137 "prototype" : "js/panels/timeline/Collapser", 137 "prototype" : "js/panels/Timeline/Collapser",
138 "properties" : { 138 "properties" : {
139 "element" : {"#" : "content-main"}, 139 "element" : {"#" : "content-main"},
140 "myContent" : {"#":"content-main"}, 140 "myContent" : {"#":"content-main"},
@@ -159,7 +159,7 @@ POSSIBILITY OF SUCH DAMAGE.
159 }, 159 },
160 160
161 "positionCollapser" : { 161 "positionCollapser" : {
162 "prototype" : "js/panels/timeline/Collapser", 162 "prototype" : "js/panels/Timeline/Collapser",
163 "properties" : { 163 "properties" : {
164 "element" : {"#" : "content_position_collapser"}, 164 "element" : {"#" : "content_position_collapser"},
165 "myContent" : {"#":"content_position_collapser"}, 165 "myContent" : {"#":"content_position_collapser"},
@@ -184,7 +184,7 @@ POSSIBILITY OF SUCH DAMAGE.
184 }, 184 },
185 185
186 "styleCollapser" : { 186 "styleCollapser" : {
187 "prototype" : "js/panels/timeline/Collapser",