aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanel.js4
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css114
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html58
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js558
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html46
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js30
-rwxr-xr-xjs/panels/CSSPanel/css-shorthand-map.js22
-rwxr-xr-xjs/panels/Materials/MaterialsPanel.js4
-rw-r--r--js/panels/Materials/materials-data.json5
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.css18
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html47
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js131
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css48
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html46
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js1148
-rwxr-xr-xjs/panels/Panel.reel/Panel.html6
-rwxr-xr-xjs/panels/Panel.reel/Panel.js2
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html8
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js16
-rwxr-xr-xjs/panels/Project/ProjectPanel.js16
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/ProjectPanelBase.js3660
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/projectpanelbase.html176
-rwxr-xr-xjs/panels/Resizer.js54
-rw-r--r--js/panels/Timeline/Collapser.js612
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.html38
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.js228
-rw-r--r--js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss2
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html16
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js68
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html502
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js1280
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss194
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html30
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js30
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss12
-rw-r--r--js/panels/Timeline/Span.reel/Span.html28
-rw-r--r--js/panels/Timeline/Span.reel/Span.js270
-rw-r--r--js/panels/Timeline/Span.reel/scss/Span.scss10
-rw-r--r--js/panels/Timeline/Style.reel/Style.html138
-rw-r--r--js/panels/Timeline/Style.reel/Style.js572
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss66
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html194
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2142
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss120
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html286
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js692
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss16
-rw-r--r--js/panels/Timeline/Track.reel/Track.html42
-rw-r--r--js/panels/Timeline/Track.reel/Track.js6
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html16
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html14
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js72
-rw-r--r--js/panels/binding-panel.reel/binding-panel.html12
-rw-r--r--js/panels/binding/binding-item.reel/binding-item.html2
-rw-r--r--js/panels/binding/edit-binding-view.reel/edit-binding-view.html2
-rw-r--r--js/panels/binding/edit-binding-view.reel/edit-binding-view.js2
-rwxr-xr-xjs/panels/color/colorbutton-manager.js16
-rwxr-xr-xjs/panels/color/colorpanel.js14
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html118
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js140
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/css/colorpanelbase.scss338
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html106
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js716
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss180
-rwxr-xr-xjs/panels/color/colorpopup-manager.js1254
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html20
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.html2
-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.js2
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html2
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.html2
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js4
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.html2
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html2
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html2
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js8
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.html2
-rw-r--r--js/panels/history-panel/history-item.reel/history-item.html12
-rw-r--r--js/panels/history-panel/history.reel/history.html16
-rw-r--r--js/panels/objects/object.reel/object.html2
-rw-r--r--js/panels/objects/object.reel/object.js2
-rw-r--r--js/panels/objects/objects-panel.reel/objects-panel.html2
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html2
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.js4
-rw-r--r--js/panels/presets/content.reel/content.html8
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html2
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js2
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html2
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.js4
-rwxr-xr-xjs/panels/properties.reel/properties.css10
-rwxr-xr-xjs/panels/properties.reel/properties.html8
-rwxr-xr-xjs/panels/properties.reel/properties.js70
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html4
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js32
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html2
-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.js2
102 files changed, 8585 insertions, 8478 deletions
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index 0788b2c0..6d4d0bdb 100755
--- a/js/panels/CSSPanel/CSSPanel.js
+++ b/js/panels/CSSPanel/CSSPanel.js
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31var Montage = require("montage/core/core").Montage, 31var Montage = require("montage/core/core").Montage,
32 PanelBase = require("js/panels/PanelBase").PanelBase; 32 PanelBase = require("js/panels/PanelBase").PanelBase;
33 33
34var CSSPanelBase = require("js/panels/CSSPanel/CSSPanelBase.reel").CSSPanelBase; 34var CSSPanelBase = require("js/panels/CSSPanel/CSSPanelBase.reel").CSSPanelBase;
35 35
@@ -74,4 +74,4 @@ exports.CSSPanel = Montage.create(PanelBase, {
74 value: null, 74 value: null,
75 writable:true 75 writable:true
76 } 76 }
77}); 77});
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
index f70cb8cb..65f7bf79 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
@@ -29,9 +29,9 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31.css_panel { 31.css_panel {
32 background-color: #FFF; 32 background-color: #FFF;
33 display: -webkit-box; 33 display: -webkit-box;
34 -webkit-box-orient: vertical; 34 -webkit-box-orient: vertical;
35 height:100%; 35 height:100%;
36} 36}
37.css_panel .resizer { 37.css_panel .resizer {
@@ -40,18 +40,18 @@ POSSIBILITY OF SUCH DAMAGE.
40 height: 1px; 40 height: 1px;
41} 41}