From bead8ce9e292f030a4b2fba6ad7fd38fb4fe5199 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 22 Mar 2012 11:16:39 -0700
Subject: IKNINJA-758 - The rotation value of the stage is not updated in the
properties panel.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/panels/properties.reel/properties.js | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 40e9b86a..782dd138 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -147,8 +147,12 @@ exports.Properties = Montage.create(Component, {
value: function(event) {
// console.log("Element Change PI ", event.detail.source); // If the event comes from the pi don't need to update
if(event.detail.source && event.detail.source !== "pi") {
+ var el = this.application.ninja.currentDocument.documentRoot;
+ if(this.application.ninja.selectedElements.length) {
+ el = this.application.ninja.selectedElements[0]._element || this.application.ninja.selectedElements[0];
+ }
+
// TODO - This should only update the properties that were changed.
- var el = this.application.ninja.selectedElements[0]._element || this.application.ninja.selectedElements[0];
this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(el, "left"));
this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(el, "top"));
this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height"));
@@ -162,9 +166,9 @@ exports.Properties = Montage.create(Component, {
this.threeD.xAngle = ElementsMediator.get3DProperty(el, "xAngle");
this.threeD.yAngle = ElementsMediator.get3DProperty(el, "yAngle");
this.threeD.zAngle = ElementsMediator.get3DProperty(el, "zAngle");
+ }
}
}
- }
},
handleSelectionChange: {
@@ -196,6 +200,13 @@ exports.Properties = Montage.create(Component, {
this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(stage, "height"));
this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(stage, "width"));
+ if(this.threeD.inGlobalMode)
+ {
+ this.threeD.xAngle = ElementsMediator.get3DProperty(stage, "xAngle");
+ this.threeD.yAngle = ElementsMediator.get3DProperty(stage, "yAngle");
+ this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle");
+ }
+
if(this.customPi !== stage.elementModel.pi) {
// We need to unregister color chips from the previous selection from the Color Model
var len = this.customSections.length;
--
cgit v1.2.3
From 1b7e627ae290dacec3a242445f3e6c5de302626a Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 23 Mar 2012 10:51:26 -0700
Subject: Tweaking some styles in the materials popup.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
.../materials-popup.reel/materials-popup.css | 46 ++++++++++++++++++----
.../materials-popup.reel/materials-popup.html | 2 +-
.../materials-popup.reel/materials-popup.js | 2 +-
3 files changed, 41 insertions(+), 9 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index 89233c64..2d339411 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -37,21 +37,53 @@
.mp_property
{
height:40px;
+ position: relative;
}
.mp_property > .prop-label
{
- float: left;
- /*width:86px;*/
- margin: 0px 8px 2px 5px;
+ position:relative;
+ top:12px;
+ float: left;
+ width: 100px;
}
.mp_property > .prop-controller
{
- float: right;
- clear: left;
- width: auto;
- margin: 0px 0px 3px 0px;
+ position:relative;
+ top:12px;
+ left: 10px;
+ float: left;
+}
+
+.mp_property .hottext,
+.mp_property .hottextInput
+{
+ width: 30px;
+}
+
+.mp_property .button
+{
+ width: 30px;
+ height: 20px;
+}
+
+.mp_property .inputRow
+{
+ top: 8px;
+ position: relative;
+}
+
+.mp_properties_list
+{
+ padding-bottom: 8px;
+}
+
+.mp_properties_list > .mp_property > .colortoolbar
+{
+ width: 27px !important;
+ height: 27px !important;
+ overflow:hidden !important;
}
.mp_buttons {
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index 34f68554..ae0ee2c8 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -104,7 +104,7 @@
<hr />
- <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;">
+ <div id="mp_properties_list" class="mp_properties_list">
<div id="mp_property" class="mp_property"></div>
</div>
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index b44761bc..bbccf45d 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -237,7 +237,7 @@ exports.MaterialsPopup = Montage.create(Component, {
}
else
{
- this.materialsData = this._dummyData1;
+ this.materialsData = this._dummyData1.slice(0);
}
this.needsDraw = true;
--
cgit v1.2.3
From bda9f8f5829c943486f8850e68c991e83f8fb8c8 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Sat, 24 Mar 2012 13:50:46 -0700
Subject: Adding logic for flatten checkbox in PI.
This requires minor modifications to both StageController and ComponentController.
Also removing unused global3DSettings CSS.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/panels/properties.reel/properties.js | 13 +++++++++-
.../sections/three-d-view.reel/three-d-view.html | 28 ++++++++++++++++++++--
.../sections/three-d-view.reel/three-d-view.js | 14 +++++++++++
3 files changed, 52 insertions(+), 3 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 782dd138..ca720ae7 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -166,9 +166,9 @@ exports.Properties = Montage.create(Component, {
this.threeD.xAngle = ElementsMediator.get3DProperty(el, "xAngle");
this.threeD.yAngle = ElementsMediator.get3DProperty(el, "yAngle");
this.threeD.zAngle = ElementsMediator.get3DProperty(el, "zAngle");
- }
}
}
+ }
},
handleSelectionChange: {
@@ -207,6 +207,12 @@ exports.Properties = Montage.create(Component, {
this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle");
}
+ if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") {
+ this.threeD.flatten = false;
+ } else {
+ this.threeD.flatten = true;
+ }
+
if(this.customPi !== stage.elementModel.pi) {
// We need to unregister color chips from the previous selection from the Color Model
var len = this.customSections.length;
@@ -271,6 +277,11 @@ exports.Properties = Montage.create(Component, {
this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height"));
this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width"));
+ if(ElementsMediator.getProperty(el, "-webkit-transform-style") === "preserve-3d") {
+ this.threeD.flatten = false;
+ } else {
+ this.threeD.flatten = true;
+ }
if(this.threeD.inGlobalMode)
{
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
index 18a7369e..b6c25baf 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
@@ -22,7 +22,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
"xAngleControl": {"@": "threeDRotX"},
"yAngleControl": {"@": "threeDRotY"},
"zAngleControl": {"@": "threeDRotZ"},
- "axisModeGroupControl": {"@": "axisModeGroup"}
+ "axisModeGroupControl": {"@": "axisModeGroup"},
+ "flattenControl": {"@": "flattenCheckbox"}
}
},
@@ -242,6 +243,29 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
"value": "Global",
"group": {"@": "axisModeGroup"}
}
+ },
+ "flattenCheckbox": {
+ "module": "montage/ui/checkbox.reel",
+ "name": "Checkbox",
+ "properties": {
+ "element": {"#": "flattenCh"},
+ "identifier": "flatten",
+ "checked": false
+ },
+ "bindings": {
+ "checked": {
+ "boundObject": {"@": "owner"},
+ "boundObjectPropertyPath": "flatten",
+ "oneway": false
+ }
+ },
+ "listeners": [
+ {
+ "type": "action",
+ "listener": {"@": "owner"},
+ "capture": false
+ }
+ ]
}
}
</script>
@@ -335,7 +359,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
<article class="fieldRow oneCol checkbox">
<div>
<div class="inputField">
- <input class="nj-skinned" type="checkbox" />
+ <input id="flattenCh" class="nj-skinned" type="checkbox" />
</div>
<div>
<label> Flatten</label>
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index 35591afa..0d3d111d 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -79,6 +79,10 @@ exports.ThreeD = Montage.create(Component, {
value: 0
},
+ flatten: {
+ value: false
+ },
+
_disableTranslation: {
value: true
},
@@ -107,6 +111,16 @@ exports.ThreeD = Montage.create(Component, {
value: null
},
+ handleAction: {
+ value: function(event) {
+ if(event.currentTarget.identifier === "flatten") {
+ this.application.ninja.elementMediator.setProperty([this.item],
+ "-webkit-transform-style",
+ event.currentTarget.checked ? ["flat"] : ["preserve-3d"]);
+ }
+ }
+ },
+
handleChange: {
value: function(event) {
if(event.wasSetByCode) {
--
cgit v1.2.3
From 50125608bba2ebfae24c1e13ec030fe7a7128158 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 29 Mar 2012 17:13:28 -0700
Subject: merge from main
---
js/panels/Splitter.js | 2 +-
.../TimelinePanel.reel/css/TimelinePanel.css | 4 +-
.../animations-presets.reel/animations-presets.js | 47 ++++++++++++++++++++-
js/panels/presets/default-animation-presets.js | 2 +
js/panels/presets/default-style-presets.js | 11 +++--
js/panels/presets/default-transition-presets.js | 8 ++++
.../presets/style-presets.reel/style-presets.js | 49 +++++++++++++++++++++-
.../transitions-presets.js | 20 ++++++++-
js/panels/resize-composer.js | 34 ++++-----------
9 files changed, 138 insertions(+), 39 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 6791e0d5..e92cb2dd 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -55,7 +55,7 @@ exports.Splitter = Montage.create(Component, {
},
set: function(value) {
this._collapsed = value;
- this.needsDraw = true;
+
this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value});
}
},
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 067285ae..129b9771 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -10,12 +10,12 @@
height: 100%;
}
.maintimeline{
+ border-style: double;
-webkit-box-flex: 1;
display: -webkit-box;
- -webkit-box-orient: horizontal;
+ -webkit-box-orient: horizontal
height : 100%;
position: relative;
- margin-top:1px;
}
.leftinside{
height: 100%;
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js
index 6a16da54..ab200212 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.js
+++ b/js/panels/presets/animations-presets.reel/animations-presets.js
@@ -22,7 +22,52 @@ exports.AnimationsLibrary = Montage.create(Component, {
},
handleNodeActivation: {
value: function(presetData) {
- this.application.ninja.presetsController.applyPreset(presetData);
+ //debugger;
+ var selection = this.application.ninja.selectedElements,
+ stylesController = this.application.ninja.stylesController,
+ selectorBase = presetData.selectorBase,
+ self = this;
+
+ if(!selection || !selection.length || selection.length === 0) {
+ return false;
+ }
+
+ selectorBase = stylesController.generateClassName(selectorBase);
+
+ presetData.rules.forEach(function(rule) {
+ if(rule.isKeyFrameRule) {
+ this.application.ninja.stylesController.addRule(
+ '@-webkit-keyframes ' + presetData.selectorBase,
+ this.stringifyKeys(rule.keys)
+ );
+ } else {
+ this.application.ninja.stylesController.addRule('.' + selectorBase + rule.selectorSuffix, rule.styles);
+ }
+
+ }, this);
+
+ selection.forEach(function(el) {
+ el._element.classList.add(selectorBase);
+ }, this);
+
+ }
+ },
+
+ stringifyKeys : {
+ value: function(keysArray) {
+ var keysString = '';
+
+ keysArray.forEach(function(key) {
+ var styles = '', style;
+
+ for(style in key.styles) {
+ styles += style + ':' + key.styles[style] + '; ';
+ }
+
+ keysString += key.keyText + ' {' + styles + ' }';
+ });
+
+ return keysString;
}
}
});
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index b12a94b2..64f91ea6 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,6 +13,7 @@ exports.animationPresets = {
"text": "Border Morph",
"selectorBase" : "border-morph",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"-webkit-animation": "border-morph 2s infinite"
}
@@ -90,6 +91,7 @@ exports.animationPresets = {
"text": "Rotater",
"selectorBase" : "rotate-with-alpha-keyframes",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"-webkit-animation-name": "rotate-with-alpha-keyframes",
"-webkit-animation-duration": "5s",
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 10b24ff4..82bec34f 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -11,9 +11,9 @@ exports.stylePresets = {
"children": [
{
"text": "Border-Radius",
- "id": "njBorderRadius",
"selectorBase" : "border-radius-preset",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"border-radius": "100px",
"border" : "1px solid #333"
@@ -22,9 +22,9 @@ exports.stylePresets = {
},
{
"text": "Drop Shadow",
- "id": "njDropShadow",
"selectorBase" : "drop-shadow",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"box-shadow": "2px 2px 50px rgba(0,0,0,0.5)",
"border" : "1px solid #CCC"
@@ -33,10 +33,9 @@ exports.stylePresets = {
},
{
"text": "Fancy Box",
- "id": "njFancyBox",
"selectorBase" : "fancy-box",
"rules" : [{
- "selectorSuffix": "",
+ "selectorSuffix" : "",
"styles" : {
"box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333",
"border" : "1px solid #FFF",
@@ -51,9 +50,9 @@ exports.stylePresets = {
"children": [
{
"text": "Italic",
- "id": "njItalic",
"selectorBase" : "italicize",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"font-style": "italic"
}
@@ -61,9 +60,9 @@ exports.stylePresets = {
},
{
"text": "Text Shadow",
- "id": "njTextShadow",
"selectorBase" : "italicize",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"text-shadow": "1px 1px 3px #333"
}
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index f8968085..15f4882f 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -13,6 +13,7 @@ exports.transitionPresets = {
"text": "Fade In",
"selectorBase" : "fade-in",
"rules" : [{
+ "selectorSuffix": "",
"styles" : {
"opacity": "0.25",
"-webkit-transition": "all 0.4s ease-in"
@@ -28,6 +29,7 @@ exports.transitionPresets = {
"text": "Fade Out",
"selectorBase" : "fade-out",
"rules" : [{
+ "selectorSuffix": "",
"styles" : {
"opacity": "1",
"-webkit-transition": "all 0.4s ease-in"
@@ -46,6 +48,7 @@ exports.transitionPresets = {
"text": "Slide Right",
"selectorBase" : "slide-right",
"rules" : [{
+ "selectorSuffix": "",
"styles" : {
"-webkit-transition": "all 0.4s ease-in"
}
@@ -60,6 +63,7 @@ exports.transitionPresets = {
"text": "Slide Left",
"selectorBase" : "slide-left",
"rules" : [{
+ "selectorSuffix": "",
"styles" : {
"-webkit-transition": "all 0.4s ease-in"
}
@@ -74,6 +78,7 @@ exports.transitionPresets = {
"text": "Rotate",
"selectorBase" : "rotate",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"-webkit-transition": "all 0.4s ease-in"
}
@@ -87,6 +92,7 @@ exports.transitionPresets = {
"text": "Scale Up",
"selectorBase" : "scale-up",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"-webkit-transition": "-webkit-transform 0.4s ease-in"
}
@@ -101,6 +107,7 @@ exports.transitionPresets = {
"text": "Scale Down",
"selectorBase" : "scale-down",
"rules" : [{
+ "selectorSuffix" : "",
"styles" : {
"-webkit-transition": "-webkit-transform 0.4s ease-in"
}
@@ -115,6 +122,7 @@ exports.transitionPresets = {
"text": "Remove 3D",
"selectorBase" : "remove-3d",
"rules" : [{
+ "selectorSuffix": "",
"styles" : {
"-webkit-transition": "all 0.4s ease-in"
}
diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 6a28e069..11f41822 100644
--- a/js/panels/presets/style-presets.reel/style-presets.js
+++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -22,13 +22,60 @@ exports.StylesLibrary = Montage.create(Component, {
},
handleNodeActivation: {
value: function(presetData) {
- this.application.ninja.presetsController.applyPreset(presetData, true);
+ var selection = this.application.ninja.selectedElements,
+ stylesController = this.application.ninja.stylesController,
+ selectorBase = presetData.selectorBase,
+ self = this, className;
+
+ if(!selection || !selection.length || selection.length === 0) {
+ return false;
+ }
+
+ function setStopRuleSelector(selector) {
+ self.application.ninja
+ .currentDocument.documentRoot
+ .elementModel.controller
+ .changeSelector(self.application.ninja.currentDocument.documentRoot, null, selector);
+ }
+
+ selectorBase = stylesController.generateClassName(selectorBase);
+
+ presetData.rules.forEach(function(rule) {
+ stylesController.addRule('.'+selectorBase + rule.selectorSuffix, rule.styles);
+ }, this);
+
+ selection.forEach(function(el) {
+ el._element.style.webkitTransition = "all 450ms linear";
+
+ el._element.addEventListener("webkitTransitionEnd", function presetTransition(e) {
+ el._element.style.webkitTransition = '';
+ setStopRuleSelector("*");
+ this.removeEventListener("webkitTransitionEnd", presetTransition, true);
+
+ }, true);
+ setStopRuleSelector("transitionStopRule");
+ el._element.classList.add(selectorBase);
+
+ //// Keep track of elements with presets and don't add duplicates
+
+ }, this);
+
+
}
},
handleDragEnd : {
value: function(sourceObject) {
console.log(sourceObject);
}
+ },
+ shouldChangeSelection : {
+ value : function(controller, newSelection, oldSelection) {
+ //
+ //debugger;
+ console.log('1Handle should change selection');
+ return false;
+ }
}
+
});
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js
index ace38dbb..f7d84085 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.js
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js
@@ -22,7 +22,25 @@ exports.TransitionsLibrary = Montage.create(Component, {
},
handleNodeActivation: {
value: function(presetData) {
- this.application.ninja.presetsController.applyPreset(presetData);
+ var selection = this.application.ninja.selectedElements,
+ stylesController = this.application.ninja.stylesController,
+ selectorBase = presetData.selectorBase,
+ self = this;
+
+ if(!selection || !selection.length || selection.length === 0) {
+ return false;
+ }
+
+ selectorBase = stylesController.generateClassName(selectorBase);
+
+ presetData.rules.forEach(function(rule) {
+ this.application.ninja.stylesController.addRule('.' + selectorBase + rule.selectorSuffix, rule.styles);
+ }, this);
+
+ selection.forEach(function(el) {
+ el._element.classList.add(selectorBase);
+ }, this);
+
}
}
});
diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 0d1774cd..6e5e89f8 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -9,14 +9,6 @@ var Composer = require("montage/ui/composer/composer").Composer;
exports.ResizeComposer = Montage.create(Composer, {
- xAxis: {
- value: true
- },
-
- yAxis: {
- value: true
- },
-
enabled : {
enumerable: false,
value: true
@@ -77,7 +69,6 @@ exports.ResizeComposer = Montage.create(Composer, {
load: {
value: function() {
this.element.addEventListener("mousedown", this, true);
- this.element.addEventListener("dblclick", this, true);
}
},
@@ -113,29 +104,18 @@ exports.ResizeComposer = Montage.create(Composer, {
captureMousemove: {
value: function(e) {
- if (this.xAxis) {
- this._deltaX = e.clientX - this._startX;
- }
- else {
- this._deltaX = 0;
- }
- if (this.yAxis) {
- this._deltaY = e.clientY - this._startY;
- }
- else {
- this._deltaY = 0;
- }
+ this._deltaX = e.clientX - this._startX;
+ this._deltaY = e.clientY - this._startY;
this._executeEvent("resizeMove");
}
},
- captureDblclick: {
- value:function(e) {
- this._reset();
- this._executeEvent("resizeReset");
+ deserializedFromTemplate: {
+ value: function() {
+ if (this.component) {
+ this.component.addComposer(this);
+ }
}
}
-
-
});
\ No newline at end of file
--
cgit v1.2.3
From 488afcf1604df3d611eca5253d57cc5a79ed80c3 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 4 Apr 2012 16:17:52 -0700
Subject: Styling PI's Materials edit button.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/panels/properties.reel/properties.css | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'js/panels')
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index f82d3660..0928da3a 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -47,6 +47,11 @@ padding-right:6px;
}
+.propertiesPanel button.nj-skinned {
+ margin-left: -12px;
+ margin-top: -3px;
+}
+
.propertiesPanel hr {
border: 0;
border-top: 1px solid #3c3c3c;
--
cgit v1.2.3
From 55f4835aa33546f5cd27e501ed461a0f7eb5038b Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 5 Apr 2012 10:31:45 -0700
Subject: Undoing mistakes from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 4 ++--
js/panels/presets/default-animation-presets.js | 2 --
js/panels/presets/default-style-presets.js | 11 ++++++-----
js/panels/presets/default-transition-presets.js | 8 --------
4 files changed, 8 insertions(+), 17 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 129b9771..ca6fe6fd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -10,12 +10,12 @@
height: 100%;
}
.maintimeline{
- border-style: double;
-webkit-box-flex: 1;
display: -webkit-box;
- -webkit-box-orient: horizontal
+ -webkit-box-orient: horizontal;
height : 100%;
position: relative;
+ margin-top: 1px;
}
.leftinside{
height: 100%;
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 4793c356..578c1622 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,7 +13,6 @@ exports.animationPresets = {
"text": "Border Morph",
"selectorBase" : "border-morph",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"-webkit-animation-name": "border-morph",
"-webkit-animation-duration": "2s",
@@ -93,7 +92,6 @@ exports.animationPresets = {
"text": "Rotater",
"selectorBase" : "rotate-with-alpha-keyframes",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"-webkit-animation-name": "rotate-with-alpha-keyframes",
"-webkit-animation-duration": "5s",
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 82bec34f..10b24ff4 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -11,9 +11,9 @@ exports.stylePresets = {
"children": [
{
"text": "Border-Radius",
+ "id": "njBorderRadius",
"selectorBase" : "border-radius-preset",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"border-radius": "100px",
"border" : "1px solid #333"
@@ -22,9 +22,9 @@ exports.stylePresets = {
},
{
"text": "Drop Shadow",
+ "id": "njDropShadow",
"selectorBase" : "drop-shadow",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"box-shadow": "2px 2px 50px rgba(0,0,0,0.5)",
"border" : "1px solid #CCC"
@@ -33,9 +33,10 @@ exports.stylePresets = {
},
{
"text": "Fancy Box",
+ "id": "njFancyBox",
"selectorBase" : "fancy-box",
"rules" : [{
- "selectorSuffix" : "",
+ "selectorSuffix": "",
"styles" : {
"box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333",
"border" : "1px solid #FFF",
@@ -50,9 +51,9 @@ exports.stylePresets = {
"children": [
{
"text": "Italic",
+ "id": "njItalic",
"selectorBase" : "italicize",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"font-style": "italic"
}
@@ -60,9 +61,9 @@ exports.stylePresets = {
},
{
"text": "Text Shadow",
+ "id": "njTextShadow",
"selectorBase" : "italicize",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"text-shadow": "1px 1px 3px #333"
}
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 15f4882f..f8968085 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -13,7 +13,6 @@ exports.transitionPresets = {
"text": "Fade In",
"selectorBase" : "fade-in",
"rules" : [{
- "selectorSuffix": "",
"styles" : {
"opacity": "0.25",
"-webkit-transition": "all 0.4s ease-in"
@@ -29,7 +28,6 @@ exports.transitionPresets = {
"text": "Fade Out",
"selectorBase" : "fade-out",
"rules" : [{
- "selectorSuffix": "",
"styles" : {
"opacity": "1",
"-webkit-transition": "all 0.4s ease-in"
@@ -48,7 +46,6 @@ exports.transitionPresets = {
"text": "Slide Right",
"selectorBase" : "slide-right",
"rules" : [{
- "selectorSuffix": "",
"styles" : {
"-webkit-transition": "all 0.4s ease-in"
}
@@ -63,7 +60,6 @@ exports.transitionPresets = {
"text": "Slide Left",
"selectorBase" : "slide-left",
"rules" : [{
- "selectorSuffix": "",
"styles" : {
"-webkit-transition": "all 0.4s ease-in"
}
@@ -78,7 +74,6 @@ exports.transitionPresets = {
"text": "Rotate",
"selectorBase" : "rotate",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"-webkit-transition": "all 0.4s ease-in"
}
@@ -92,7 +87,6 @@ exports.transitionPresets = {
"text": "Scale Up",
"selectorBase" : "scale-up",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"-webkit-transition": "-webkit-transform 0.4s ease-in"
}
@@ -107,7 +101,6 @@ exports.transitionPresets = {
"text": "Scale Down",
"selectorBase" : "scale-down",
"rules" : [{
- "selectorSuffix" : "",
"styles" : {
"-webkit-transition": "-webkit-transform 0.4s ease-in"
}
@@ -122,7 +115,6 @@ exports.transitionPresets = {
"text": "Remove 3D",
"selectorBase" : "remove-3d",
"rules" : [{
- "selectorSuffix": "",
"styles" : {
"-webkit-transition": "all 0.4s ease-in"
}
--
cgit v1.2.3
From 0221288738afd5310ab7659fb951c1d7fb9b93b8 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 5 Apr 2012 10:46:45 -0700
Subject: Undoing some minor spacing differences from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 2 +-
js/panels/presets/transitions-presets.reel/transitions-presets.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index ca6fe6fd..067285ae 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -15,7 +15,7 @@
-webkit-box-orient: horizontal;
height : 100%;
position: relative;
- margin-top: 1px;
+ margin-top:1px;
}
.leftinside{
height: 100%;
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js
index 24fab684..4ca2a662 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.js
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js
@@ -23,6 +23,6 @@ exports.TransitionsLibrary = Montage.create(Component, {
handleNodeActivation: {
value: function(presetData) {
this.application.ninja.presetsController.applyPreset(presetData);
- }
- }
+ }
+ }
});
--
cgit v1.2.3
From c950fc80742f54f6b485bbda66f69d42cb762d40 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 5 Apr 2012 11:15:00 -0700
Subject: Undoing bad auto-merge resize-composer.js.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/panels/resize-composer.js | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
(limited to 'js/panels')
diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 6e5e89f8..0d1774cd 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -9,6 +9,14 @@ var Composer = require("montage/ui/composer/composer").Composer;
exports.ResizeComposer = Montage.create(Composer, {
+ xAxis: {
+ value: true
+ },
+
+ yAxis: {
+ value: true
+ },
+
enabled : {
enumerable: false,
value: true
@@ -69,6 +77,7 @@ exports.ResizeComposer = Montage.create(Composer, {
load: {
value: function() {
this.element.addEventListener("mousedown", this, true);
+ this.element.addEventListener("dblclick", this, true);
}
},
@@ -104,18 +113,29 @@ exports.ResizeComposer = Montage.create(Composer, {
captureMousemove: {
value: function(e) {
- this._deltaX = e.clientX - this._startX;
- this._deltaY = e.clientY - this._startY;
+ if (this.xAxis) {
+ this._deltaX = e.clientX - this._startX;
+ }
+ else {
+ this._deltaX = 0;
+ }
+ if (this.yAxis) {
+ this._deltaY = e.clientY - this._startY;
+ }
+ else {
+ this._deltaY = 0;
+ }
this._executeEvent("resizeMove");
}
},
- deserializedFromTemplate: {
- value: function() {
- if (this.component) {
- this.component.addComposer(this);
- }
+ captureDblclick: {
+ value:function(e) {
+ this._reset();
+ this._executeEvent("resizeReset");
}
}
+
+
});
\ No newline at end of file
--
cgit v1.2.3