aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/panels
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Materials/materials-data.json99
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html13
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js16
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js196
-rwxr-xr-xjs/panels/Panel.reel/Panel.html1
-rwxr-xr-xjs/panels/Panel.reel/Panel.js12
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js48
-rwxr-xr-xjs/panels/Resizer.js13
-rwxr-xr-xjs/panels/Splitter.js6
-rw-r--r--js/panels/Timeline/Collapser.js34
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js47
-rw-r--r--js/panels/Timeline/Style.reel/Style.js30
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js107
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html8
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js83
-rw-r--r--js/panels/Timeline/Track.reel/Track.js5
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js10
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.js4
-rwxr-xr-xjs/panels/color/colorpanel.js13
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html77
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js178
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html48
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js204
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss2
-rw-r--r--js/panels/color/colorpanelpopup.reel/img/icon_palette.jpgbin0 -> 1352 bytes
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.js4
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html3
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.js10
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html2
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.js21
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html23
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js5
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js10
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.js5
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html6
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.js12
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.js31
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js13
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.html1
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js19
-rw-r--r--js/panels/css-panel/styles-view-delegate.js6
-rw-r--r--js/panels/presets/content.reel/content.js15
-rwxr-xr-xjs/panels/properties.reel/properties.html9
-rwxr-xr-xjs/panels/properties.reel/properties.js97
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.js1
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js12
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html25
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js81
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js55
-rw-r--r--js/panels/resize-composer.js6
54 files changed, 1256 insertions, 480 deletions
<
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index f06ab6c8..a5d8997b 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -5,37 +5,100 @@
5 "label": "Ninja Materials", 5 "label": "Ninja Materials",
6 "children": [ 6 "children": [
7 { 7 {
8 "label": "Uber", 8 "label": "Bump Metal",
9 "id" : "UberMaterial" 9 "id" : "Bump Metal"
10 }, 10 },
11 { 11 {
12 "label": "Bump Metal", 12 "label": "Deform",
13 "id" : "BumpMetalMaterial" 13 "id" : "Deform"
14 },
15 {
16 "label": "Flag",
17 "id" : "Flag"
18 },
19 {
20 "label": "Fly",
21 "id" : "Fly"
22 },
23 {
24 "label": "Julia",
25 "id" : "Julia"
26 },
27 {
28 "label": "Keleidoscope",
29 "id" : "Keleidoscope"
14 }, 30 },
15 { 31 {
16 "label": "Linear Gradient", 32 "label": "Linear Gradient",
17 "id" : "LinearGradientMaterial" 33 "id" : "Linear Gradient"
34 },
35 {
36 "label": "Mandel",
37 "id" : "Mandel"
38 },
39 {
40 "label": "Paris",
41 "id" : "Paris"
42 },
43 {
44 "label": "Plasma",
45 "id" : "Plasma"
46 },
47 {
48 "label": "Pulse",
49 "id" : "Pulse"
50 },
51 {
52 "label": "Radial Blur",
53 "id" : "Radial Blur"
18 }, 54 },
19 { 55 {
20 "label": "Radial Gradient", 56 "label": "Radial Gradient",
21 "id" : "RadialGradientMaterial" 57 "id" : "Radial Gradient"
22 }, 58 },
23 { 59 {
24 "label": "Flat", 60 "label": "Raiders",
25 "id" : "FlatMaterial" 61 "id" : "Raiders"
26 } 62 },
27 ] 63 {
28 }, 64 "label": "Relief Tunnel",
29 { 65 "id" : "Relief Tunnel"
30 "label": "Custom Materials", 66 },
31 "children": [ 67 {
68 "label": "Square Tunnel",
69 "id" : "Square Tunnel"
70 },
71 {
72 "label": "Star",
73 "id" : "Star"
74 },
75 {
76 "label": "Taper",
77 "id" : "Taper"
78 },
79 {
80 "label": "Tunnel",
81 "id" : "Tunnel"
82 },
83 {
84 "label": "Twist",
85 "id" : "Twist"
86 },
87 {
88 "label": "Twist Vertex",
89 "id" : "Twist Vertex"
90 },
91 {
92 "label": "Uber",
93 "id" : "Uber"
94 },
32 { 95 {
33 "label": "Checker Board", 96 "label": "Water",
34 "id" : "CheckerBoard" 97 "id" : "Water"
35 }, 98 },
36 { 99 {
37 "label": "Shiny Metal", 100 "label": "Z-Invert",
38 "id" : "ShinyMetal" 101 "id" : "Z-Invert"
39 } 102 }
40 ] 103 ]
41 } 104 }
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index b5d7a869..6fa54495 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -13,7 +13,8 @@
13 "addButton": { 13 "addButton": {