aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components')
-rw-r--r--js/components/about-box.reel/about-box.html2
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html2
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html2
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html2
-rwxr-xr-xjs/components/combobox.reel/combobox.html2
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html2
-rwxr-xr-xjs/components/hottext.reel/hottext.html2
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html8
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js2
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html10
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html6
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html6
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.css4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html2
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.css4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html10
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html36
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html10
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html10
-rwxr-xr-xjs/components/menu/menu.reel/menu.html6
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html2
-rwxr-xr-xjs/components/popup.reel/popup.html2
-rwxr-xr-xjs/components/radio.reel/radio.html2
-rwxr-xr-xjs/components/slider.reel/slider.html8
-rwxr-xr-xjs/components/textfield.reel/textfield.html2
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html10
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html2
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html10
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html2
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html4
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html2
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html12
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html2
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html4
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html26
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html2
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html22
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js6
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html39
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
-rw-r--r--js/components/treeview/branch.reel/branch.html8
-rw-r--r--js/components/treeview/leaf.reel/leaf.html4
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html10
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html4
-rw-r--r--js/components/treeview/treeview.reel/treeview.html4
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html12
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html6
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html6
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html8
56 files changed, 184 insertions, 191 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index 1f41699e..ecdd4389 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.html
@@ -21,7 +21,7 @@
21 </script> 21 </script>
22</head> 22</head>
23<body> 23<body>
24<div class="mainAboutBoxContainer" id="mainAboutBoxContainer"> 24<div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer">
25 <div id="about_box_ninja_logo"></div> 25 <div id="about_box_ninja_logo"></div>
26 <div id="aboutBoxTextBlock" class="baseAboutBoxText"> 26 <div id="aboutBoxTextBlock" class="baseAboutBoxText">
27 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> 27 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html
index a03d72fb..ded91fc2 100755
--- a/js/components/checkbox.reel/checkbox.html
+++ b/js/components/checkbox.reel/checkbox.html
@@ -18,6 +18,6 @@
18 </script> 18 </script>
19</head> 19</head>
20<body> 20<body>
21 <input id="ch_comp" class="nj-skinned" type="checkbox"> 21 <input data-montage-id="ch_comp" class="nj-skinned" type="checkbox">
22</body> 22</body>
23</html> \ No newline at end of file 23</html> \ No newline at end of file
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index c5bc186a..2e189c87 100755
--- a/js/components/colorbar.reel/colorbar.html
+++ b/js/components/colorbar.reel/colorbar.html
@@ -29,7 +29,7 @@
29 29
30 <body> 30 <body>
31 31
32 <canvas id="colorbar" class="colorbar"></canvas> 32 <canvas data-montage-id="colorbar" class="colorbar"></canvas>
33 33
34 </body> 34 </body>
35 35
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index ef955c2d..707bd637 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.html
@@ -29,7 +29,7 @@
29 29
30 <body> 30 <body>
31 31
32 <div id="colorwheel" class="colorwheel"> 32 <div data-montage-id="colorwheel" class="colorwheel">
33 <canvas></canvas> 33 <canvas></canvas>
34 <canvas></canvas> 34 <canvas></canvas>
35 <canvas></canvas> 35 <canvas></canvas>
diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html
index a68dd37f..81920005 100755
--- a/js/components/combobox.reel/combobox.html
+++ b/js/components/combobox.reel/combobox.html
@@ -18,6 +18,6 @@
18 </script> 18 </script>
19</head> 19</head>
20<body> 20<body>
21 <select id="cb_comp" class="nj-skinned" /> 21 <select data-montage-id="cb_comp" class="nj-skinned" />
22</body> 22</body>
23</html> \ No newline at end of file 23</html> \ No newline at end of file
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index afd42925..b0e23653 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -29,7 +29,7 @@
29 29
30 <body> 30 <body>
31 31
32 <div id="gradientpicker" class="gradientpicker"> 32 <div data-montage-id="gradientpicker" class="gradientpicker">
33 33
34 <div class="type"> 34 <div class="type">
35 <input type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/><label for="cp_gp_linear">Linear Gradient</label> 35 <input type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/><label for="cp_gp_linear">Linear Gradient</label>
diff --git a/js/components/hottext.reel/hottext.html b/js/components/hottext.reel/hottext.html
index 314d4ca3..c759354e 100755
--- a/js/components/hottext.reel/hottext.html
+++ b/js/components/hottext.reel/hottext.html
@@ -23,6 +23,6 @@
23 23
24</head> 24</head>
25<body> 25<body>
26 <input id="hottext"/> 26 <input data-montage-id="hottext" class="hottext"/>
27</body> 27</body>
28</html> \ No newline at end of file 28</html> \ No newline at end of file
diff --git a/js/components/hottextunit.reel/hottextunit.html b/js/components/hottextunit.reel/hottextunit.html
index 3f946f9b..ec10f975 100755
--- a/js/components/hottextunit.reel/hottextunit.html
+++ b/js/components/hottextunit.reel/hottextunit.html
@@ -22,6 +22,6 @@
22 22
23</head> 23</head>
24<body> 24<body>
25 <div id="hottextunit" class="hottextunit"></div> 25 <div data-montage-id="hottextunit" class="hottextunit"></div>
26</body> 26</body>
27</html> \ No newline at end of file 27</html> \ No newline at end of file
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 7e14157e..ae3e2022 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -78,11 +78,11 @@
78 </head> 78 </head>
79 <body> 79 <body>
80 80
81 <section id="breadcrumbTrail" class="breadcrumbTrail"> 81 <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail">
82 <div id="breadcrumb_container"> 82 <div data-montage-id="breadcrumb_container">
83 <button id="breadcrumb_button" class="nj-skinned"></button> 83 <button data-montage-id="breadcrumb_button" class="nj-skinned"></button>
84 </div> 84 </div>
85 <div id="disabledCondition" class="panelDisabled"></div>