aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html17
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html13
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.css43
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html31
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css15
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html44
-rwxr-xr-xjs/panels/Panel.reel/Panel.html38
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html27
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/projectpanelbase.html5
-rwxr-xr-xjs/panels/Splitter.js35
-rw-r--r--js/panels/Timeline/Collapser.js2
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html7
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js43
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html160
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js221
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css33
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss3
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html45
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js290
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css9
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/.sass-cache/a26ed2cbe268f8c721d1b1d8dfa075c8c5b47e72/PropertyTrack.scsscbin0 -> 5151 bytes
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss6
-rw-r--r--js/panels/Timeline/Span.reel/Span.html7
-rw-r--r--js/panels/Timeline/Style.reel/Style.html26
-rw-r--r--js/panels/Timeline/Style.reel/Style.js6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html90
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js396
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html114
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js350
-rw-r--r--js/panels/Timeline/Track.reel/Track.html17
-rw-r--r--js/panels/Timeline/Track.reel/Track.js12
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html9
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html17
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js102
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html7
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html7
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html7
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html7
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html18
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js64
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html21
-rw-r--r--js/panels/presets/content.reel/content.html29
-rw-r--r--js/panels/presets/default-animation-presets.js21
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html21
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html21
-rwxr-xr-xjs/panels/properties.reel/properties.html42
-rwxr-xr-xjs/panels/properties.reel/properties.js9
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html15
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html15
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html15
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html10
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html15
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html33
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html66
57 files changed, 1581 insertions, 1101 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index 98b2b61d..1d74fab4 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "resizer1": { 13 "resizer1": {
14 "module": "js/panels/Resizer", 14 "prototype": "js/panels/Resizer",
15 "name": "Resizer",
16 "properties": { 15 "properties": {
17 "element": {"#": "subPanelResizer"}, 16 "element": {"#": "subPanelResizer"},
18 "panel": {"#": "nj-section-stylesheets"}, 17 "panel": {"#": "nj-section-stylesheets"},
@@ -21,16 +20,14 @@
21 }, 20 },
22 21
23 "ComputedStyleSubPanel1": { 22 "ComputedStyleSubPanel1": {
24 "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", 23 "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
25 "name": "ComputedStyleSubPanel",
26 "properties": { 24 "properties": {
27 "element": {"#": "nj-computed-sub-panel"} 25 "element": {"#": "nj-computed-sub-panel"}
28 } 26 }
29 }, 27 },
30 28
31 "owner": { 29 "owner": {
32 "module": "js/panels/CSSPanel/CSSPanelBase.reel", 30 "prototype": "js/panels/CSSPanel/CSSPanelBase.reel",
33 "name": "CSSPanelBase",
34 "properties": { 31 "properties": {
35 "element": {"#": "css_panel"}, 32 "element": {"#": "css_panel"},
36 "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"} 33 "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"}
@@ -41,13 +38,13 @@
41 </script> 38 </script>
42 </head> 39 </head>
43<body> 40<body>
44 <div id="css_panel" class="css_panel"> 41 <div data-montage-id="css_panel" class="css_panel">
45 <!-- Stylesheet list subsection --> 42 <!-- Stylesheet list subsection -->
46 <h2 id="nj-css-sheets-header" class="nj-section-header"> 43 <h2 id="nj-css-sheets-header" class="nj-section-header">
47 <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> 44 <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div>
48 Stylesheets <span id="nj-current-doc-name"></span> 45 Stylesheets <span id="nj-current-doc-name"></span>
49 </h2> 46 </h2>
50 <div id="nj-section-stylesheets" class="nj-sub-panel"> 47 <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel">
51 <ul id="nj-sheet-list"></ul> 48 <ul id="nj-sheet-list"></ul>
52 </div> 49 </div>
53 <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> 50 <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">
@@ -62,7 +59,7 @@
62 <span id="nj-num-items">0</span> elements selected 59 <span id="nj-num-items">0</span> elements selected
63 </span> 60 </span>
64 </h2> 61 </h2>
65 <div id="nj-computed-sub-panel"></div> 62 <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div>
66 <div id="nj-section-styles" class="nj-sub-panel"> 63 <div id="nj-section-styles" class="nj-sub-panel">
67 <!-- <ul id="nj-css-rule-list"></ul> --> 64 <!-- <ul id="nj-css-rule-list"></ul> -->
68 </div> 65 </div>
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
index c30d2fb4..25196bc6 100755
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", 15 "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
16 "name": "ComputedStyleSubPanel",
17 "properties": { 16 "properties": {
18 "element": {"#": "nj-css-panel-computed"}, 17 "element": {"#": "nj-css-panel-computed"},
19 "groupDropDown": {"#": "nj-css-group-select"}, 18 "groupDropDown": {"#": "nj-css-group-select"},
@@ -27,10 +26,10 @@
27 26
28</head> 27</head>
29<body id="computestylesubpanel" onload=""> 28<body id="computestylesubpanel" onload="">
30 <div id="nj-css-panel-computed" class="nj-css-panel-hide"> 29 <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-hide">
31</