From e25474df5116a7e336933a1d1d17ff11a0ef9786 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 28 Jun 2012 11:17:28 -0700
Subject: Fixing the button for the shape pi
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
js/panels/properties.reel/properties.css | 12 ++++++++----
js/panels/properties.reel/sections/custom.reel/custom.js | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index d1aa750a..ce5145d0 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -314,11 +314,13 @@ input label {
width:45px;
}
-.propertiesPanel div.montage-button:disabled {
+/*.propertiesPanel div.montage-button:disabled {*/
+.propertiesPanel div[type=button]:disabled {
opacity: 0.4;
}
-.propertiesPanel div.montage-button {
+/*.propertiesPanel div.montage-button {*/
+.propertiesPanel div[type=button] {
font-size: 9px;
cursor: pointer;
display: block;
@@ -336,10 +338,12 @@ input label {
height: 14px;
}
-.propertiesPanel div.montage-button:active {
+/*.propertiesPanel div.montage-button:active {*/
+.propertiesPanel div[type=button]:active {
background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%);
}
-.propertiesPanel div.montage-button:hover {
+/*.propertiesPanel div.montage-button:hover {*/
+.propertiesPanel div[type=button]:hover {
-webkit-box-shadow: 0px 0px 3px #b4b4b4;
}
\ No newline at end of file
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 9c31cf45..84e89334 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -20,7 +20,7 @@ var Dropdown = require("js/components/combobox.reel").Combobox;
var TextField = require("js/components/textfield.reel").TextField;
var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox;
var ColorChip = require("js/components/ui/color-chip.reel").ColorChip;
-var Button = require("montage/ui/button.reel").Button;
+var Button = require("montage/ui/native/button.reel").Button;
exports.CustomSection = Montage.create(Component, {
--
cgit v1.2.3
From 12b8f40d5593d55e1fe64e4bef2ac3bc6709f6ff Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 28 Jun 2012 11:24:41 -0700
Subject: removing some comments
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
js/panels/properties.reel/properties.css | 4 ----
1 file changed, 4 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index ce5145d0..786eb57a 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -314,12 +314,10 @@ input label {
width:45px;
}
-/*.propertiesPanel div.montage-button:disabled {*/
.propertiesPanel div[type=button]:disabled {
opacity: 0.4;
}
-/*.propertiesPanel div.montage-button {*/
.propertiesPanel div[type=button] {
font-size: 9px;
cursor: pointer;
@@ -338,12 +336,10 @@ input label {
height: 14px;
}
-/*.propertiesPanel div.montage-button:active {*/
.propertiesPanel div[type=button]:active {
background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%);
}
-/*.propertiesPanel div.montage-button:hover {*/
.propertiesPanel div[type=button]:hover {
-webkit-box-shadow: 0px 0px 3px #b4b4b4;
}
\ No newline at end of file
--
cgit v1.2.3
From 3e4450efb05018107be5e3012bce45cc324569f8 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 28 Jun 2012 09:48:44 -0700
Subject: Timeline: Better deselection of tweens when selecting/deselecting
layers.
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolved: use mine (doesn't matter, affected code block is in
commented out section)
---
.../Timeline/TimelinePanel.reel/TimelinePanel.js | 40 +++++++++++++++++-----
1 file changed, 32 insertions(+), 8 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 45353a08..3d31a50b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1217,8 +1217,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
arrCurrentElementsSelected = [];
var matchedValues = 0;
- for(i=0;i<arrSelectedIndexesLength;i++){
- for(j=0;j<currentLayersSelectedLength;j++){
+ /*
+ if (arrSelectedIndexesLength !== 0) {
+ for(i=0;i<arrSelectedIndexesLength;i++){
+ for(j=0;j<currentLayersSelectedLength;j++){
+
+ if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){
+ matchedValues+=1;
+ }
+ }
+ }
+
+ if(matchedValues === arrSelectedIndexesLength){
+ return;
+ }
+ }
if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
matchedValues+=1;
@@ -1226,11 +1239,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
}
}
- if(matchedValues === arrSelectedIndexesLength){
- return;
- }
- /*
// TODO: this should probably check to see if it actually needs to run.
console.log(arrSelectedIndexes);
@@ -1266,6 +1275,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
if (arrSelectedIndexes.indexOf(i) < 0) {
this.arrLayers[i].layerData.isSelected = false;
this.triggerLayerBinding(i);
+
+ // Check to see if this layer, that we're deselecting, has
+ // any selected keyframes associated with it. If it does, deselect them.
+ for (var j = 0; j < this.selectedTweens.length; j++) {
+ var currentStageElement;
+ if (typeof(this.selectedTweens[j].parentComponent.parentComponent.trackType) === "undefined") {
+ currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.stageElement;
+ } else {
+ currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.stageElement;
+ }
+ if (this.arrLayers[i].layerData.stageElement === currentStageElement) {
+ this.selectedTweens[j].deselectTween();
+ this.selectedTweens.splice(j, 1);
+ }
+ }
}
}
}
@@ -1273,8 +1297,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
this.currentLayersSelected = false;
}
- // Deselect any tweens
- this.deselectTweens();
+ // Deselect tweens
+ //this.deselectTweens();
// If we are actually going to be selecting things, create an empty array to use
--
cgit v1.2.3
From d6c7aa97651c259612636df6ae9063229a56d48f Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Thu, 28 Jun 2012 16:52:01 -0700
Subject: Presets/CSS Panel - Update css panel with preset class.
---
js/panels/CSSPanel/css-shorthand-map.js | 11 ++++++++++-
js/panels/css-panel/styles-view-delegate.js | 22 +++++++++++++++++-----
2 files changed, 27 insertions(+), 6 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
index d469e2a1..e38627f7 100755
--- a/js/panels/CSSPanel/css-shorthand-map.js
+++ b/js/panels/CSSPanel/css-shorthand-map.js
@@ -68,7 +68,15 @@ exports.CSS_SHORTHAND_MAP = {
'padding-left' : ['padding'],
'padding-right' : ['padding'],
'padding-top' : ['padding'],
-
+
+ '-webkit-animation-name' : ['-webkit-animation'],
+ '-webkit-animation-duration' : ['-webkit-animation'],
+ '-webkit-animation-timing-function' : ['-webkit-animation'],
+ '-webkit-animation-delay' : ['-webkit-animation'],
+ '-webkit-animation-iteration-count' : ['-webkit-animation'],
+ '-webkit-animation-direction' : ['-webkit-animation'],
+ '-webkit-animation-fill-mode' : ['-webkit-animation'],
+
'-webkit-transition-property' : ['-webkit-transition'],
'-webkit-transition-duration' : ['-webkit-transition'],
'-webkit-transition-timing-function' : ['-webkit-transition'],
@@ -91,6 +99,7 @@ exports.CSS_SHORTHAND_TO_SUBPROP_MAP = {
'list' : ["list-style-type", "list-style-image", "list-style-position"],
'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"],
'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"],
+ '-webkit-animation': ["webkit-animation-name", "webkit-animation-duration", "webkit-animation-timing-function", "webkit-animation-delay", "webkit-animation-iteration-count", "webkit-animation-direction", "webkit-animation-fill-mode"],
'-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration",
"-webkit-transition-timing-function", "-webkit-transition-delay"]
};
\ No newline at end of file
diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js
index a7c1f0d9..4f41ff12 100644
--- a/js/panels/css-panel/styles-view-delegate.js
+++ b/js/panels/css-panel/styles-view-delegate.js
@@ -171,7 +171,8 @@ exports.StylesViewDelegate = Montage.create(Component, {
},
handlePropertyChange : {
value: function(rule, property, value, oldProperty, style) {
- var browserValue;
+ var declaration = style.parentComponent.parentComponent,
+ browserValue;
if(style.editingNewStyle) {
if(property === '') {
@@ -187,14 +188,17 @@ exports.StylesViewDelegate = Montage.create(Component, {
if(property === '') {
style.deleting = true;
- style.parentComponent.parentComponent.removeStyle(style.source);
- this._dispatchChange(oldProperty, browserValue);
+ declaration.removeStyle(style.source);
+ this._dispatchChange(oldProperty);
return false;
}
// now add new property
browserValue = this.stylesController.setStyle(rule, property, value);
+ //// Update the css text so it knows when to update
+ declaration.cssText = rule.style.cssText;
+
///// Mark style as invalid if the browser doesn't accept it
style.invalid = (browserValue === null);
@@ -203,13 +207,18 @@ exports.StylesViewDelegate = Montage.create(Component, {
},
handleValueChange : {
value: function(rule, property, value, style) {
- var browserValue, units;
+ var declaration = style.parentComponent.parentComponent,
+ browserValue, units;
if(value === '') {
///// Remove old property
style.deleting = true;
this.stylesController.deleteStyle(rule, property);
- style.parentComponent.parentComponent.removeStyle(style.source);
+ declaration.removeStyle(style.source);
+
+ //// Update the css text so it knows when to update
+ declaration.cssText = rule.style.cssText;
+
this._dispatchChange(property, browserValue);
return false;
}
@@ -218,6 +227,9 @@ exports.StylesViewDelegate = Montage.create(Component, {
browserValue = this.stylesController.setStyle(rule, property, value);
style.browserValue = browserValue;
+ //// Update the css text so it knows when to update
+ declaration.cssText = rule.style.cssText;
+
///// Mark style as invalid if the browser doesn't accept it
style.invalid = (browserValue === null);
--
cgit v1.2.3