From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/panels/Timeline/Span.reel/Span.html | 26 +-- js/panels/Timeline/Span.reel/Span.js | 246 ++++++++++++++-------------- js/panels/Timeline/Span.reel/scss/Span.scss | 8 +- 3 files changed, 140 insertions(+), 140 deletions(-) (limited to 'js/panels/Timeline/Span.reel') diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index d328fcdb..0a3e1ab8 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html @@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - - - + + + - - + + -
-
-
-
- ease-out -
-
-
+
+
+
+
+ ease-out +
+
+
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index 0d013fe5..0b4ab8fc 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.js @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component; + Component = require("montage/ui/component").Component; var Span = exports.Span = Montage.create(Component, { @@ -37,7 +37,7 @@ var Span = exports.Span = Montage.create(Component, { value: true }, - // BEGIN: Models + // BEGIN: Models _spanWidth:{ value:0 }, @@ -53,183 +53,183 @@ var Span = exports.Span = Montage.create(Component, { }, _isHighlighted: { - value: false + value: false }, isHighlighted: { - get: function() { - return this._isHighlighted; - }, - set: function(newVal) { - if (newVal !== this._isHighlighted) { - this._isHighlighted = newVal; - this.needsDraw = true; - } - } + get: function() { + return this._isHighlighted; + }, + set: function(newVal) { + if (newVal !== this._isHighlighted) { + this._isHighlighted = newVal; + this.needsDraw = true; + } + } }, _areChoicesVisible: { - value: false + value: false }, areChoicesVisible: { - get: function() { - return this._areChoicesVisible; - }, - set: function(newVal) { - if (newVal !== this._areChoicesVisible) { - this._areChoicesVisible = newVal; - this.needsDraw = true; - } - } + get: function() { + return this._areChoicesVisible; + }, + set: function(newVal) { + if (newVal !== this._areChoicesVisible) { + this._areChoicesVisible = newVal; + this.needsDraw = true; + } + } }, _easing: { - value: "none" + value: "none" }, easing: { - get: function() { - return this._easing; - }, - set: function(newVal) { - if (newVal !== this._easing) { - if (typeof(newVal) === "undefined") { - newVal = "none"; - } - this._easing = newVal; - this.parentComponent.easing = this.easing; - this.parentComponent.tweenData.easing = this.easing; - this.parentComponent.setKeyframeEase(newVal); - this.needsDraw = true; - } - } + get: function() { + return this._easing; + }, + set: function(newVal) { + if (newVal !== this._easing) { + if (typeof(newVal) === "undefined") { + newVal = "none"; + } + this._easing = newVal; + this.parentComponent.easing = this.easing; + this.parentComponent.tweenData.easing = this.easing; + this.parentComponent.setKeyframeEase(newVal); + this.needsDraw = true; + } + } + }, + + // BEGIN: draw cycle + prepareForDraw: { + value: function() { + this.init(); + } }, - - // BEGIN: draw cycle - prepareForDraw: { - value: function() { - this.init(); - } - }, - + draw:{ value: function(){ this.element.style.width = this.spanWidth + "px"; if ((this.spanWidth <= 70) && (this.spanWidth >0)) { - var containerWidth = this.spanWidth -18, - choiceWidth; - if (containerWidth < 0) { - containerWidth = 0; - } - choiceWidth = containerWidth -3; - if (choiceWidth < 0) { - choiceWidth = 0; - } - this.container_easing.style.width = containerWidth + "px"; - this.easing_choice.style.width = choiceWidth + "px"; - this.easing_choice.style.overflow = "hidden"; + var containerWidth = this.spanWidth -18, + choiceWidth; + if (containerWidth < 0) { + containerWidth = 0; + } + choiceWidth = containerWidth -3; + if (choiceWidth < 0) { + choiceWidth = 0; + } + this.container_easing.style.width = containerWidth + "px"; + this.easing_choice.style.width = choiceWidth + "px"; + this.easing_choice.style.overflow = "hidden"; } - if (this.spanWidth > 70) { - this.container_easing.setAttribute("style", ""); - this.easing_choice.setAttribute("style", ""); + if (this.spanWidth > 70) { + this.container_easing.setAttribute("style", ""); + this.easing_choice.setAttribute("style", ""); } // Highlight the span? if (this.isHighlighted === true) { - this.element.classList.add("spanHighlight"); + this.element.classList.add("spanHighlight"); } else { - this.element.classList.remove("spanHighlight"); + this.element.classList.remove("spanHighlight"); } /* // Hide or show the choices menu? if (this.areChoicesVisible === true) { - this.easing_choices.style.display = "block"; + this.easing_choices.style.display = "block"; } else { - this.easing_choices.style.display = "none"; + this.easing_choices.style.display = "none"; } */ // Change easing? if (this.easing_choice.innerText !== this.easing) { - this.easing_choice.innerText = this.easing; + this.easing_choice.innerText = this.easing; } } }, - // BEGIN: Controllers - init: { - value: function() { - this.easing_choice.addEventListener("click", this.handleEasingChoiceClick.bind(this), false); - //this.easing_choices.addEventListener("click", this.handleEasingChoicesClick.bind(this), false); + // BEGIN: Controllers + init: { + value: function() { + this.easing_choice.addEventListener("click", this.handleEasingChoiceClick.bind(this), false); + //this.easing_choices.addEventListener("click", this.handleEasingChoicesClick.bind(this), false); - } - }, - + } + }, + highlightSpan:{ value: function(){ - // Class add/remove should only be done in draw cycle. + // Class add/remove should only be done in draw cycle. // this.element.classList.add("spanHighlight"); this.isHighlighted = true; } }, handleEasingChoiceClick: { - value: function(event) { - event.stopPropagation(); - //this.areChoicesVisible = true; - this.application.ninja.timeline.easingMenu.anchor = this.easing_choice; - this.application.ninja.timeline.easingMenu.currentChoice = event.currentTarget.innerText; + value: function(event) { + event.stopPropagation(); + //this.areChoicesVisible = true; + this.application.ninja.timeline.easingMenu.anchor = this.easing_choice; + this.application.ninja.timeline.easingMenu.currentChoice = event.currentTarget.innerText; - function findPos(obj) { - var objReturn = {}; - objReturn.top = 0; - objReturn.left = 0; + function findPos(obj) { + var objReturn = {}; + objReturn.top = 0; + objReturn.left = 0; - if (obj.offsetParent) { + if (obj.offsetParent) { - do { - objReturn.left += obj.offsetLeft; - objReturn.top += obj.offsetTop; - - } while (obj = obj.offsetParent); - } - return objReturn; - } - var objPos = findPos(event.target); - this.application.ninja.timeline.easingMenu.top = objPos.top +38 - (this.application.ninja.timeline.layout_tracks.scrollTop); - this.application.ninja.timeline.easingMenu.left = objPos.left+18 - (this.application.ninja.timeline.layout_tracks.scrollLeft); - this.application.ninja.timeline.easingMenu.show(); - this.application.ninja.timeline.easingMenu.callingComponent = this; - } + do { + objReturn.left += obj.offsetLeft; + objReturn.top += obj.offsetTop; + + } while (obj = obj.offsetParent); + } + return objReturn; + } + var objPos = findPos(event.target); + this.application.ninja.timeline.easingMenu.top = objPos.top +38 - (this.application.ninja.timeline.layout_tracks.scrollTop); + this.application.ninja.timeline.easingMenu.left = objPos.left+18 - (this.application.ninja.timeline.layout_tracks.scrollLeft); + this.application.ninja.timeline.easingMenu.show(); + this.application.ninja.timeline.easingMenu.callingComponent = this; + } }, handleEasingChoicesClick: { - value: function(event) { - event.stopPropagation(); + value: function(event) { + event.stopPropagation(); - // Remove the pointer to ourselves - //this.application.ninja.timeline.currentOpenSpanMenu = false; - - // Un-highlight the old choice and highlight the new choice - this.application.ninja.timeline.easingMenu.popup.contentEl.querySelector(".easing-selected").classList.remove("easing-selected"); - event.target.classList.add("easing-selected"); - - // Set the easing - this.easing = event.target.dataset.ninjaEase; - this.parentComponent.easing = this.easing; - this.parentComponent.tweenData.easing = this.easing; - - // Unbind the event handler - this.application.ninja.timeline.easingMenu.popup.contentEl.removeEventListener("click"); - - // Hide the menu. - this.hideEasingMenu(); - } + // Remove the pointer to ourselves + //this.application.ninja.timeline.currentOpenSpanMenu = false; + + // Un-highlight the old choice and highlight the new choice + this.application.ninja.timeline.easingMenu.popup.contentEl.querySelector(".easing-selected").classList.remove("easing-selected"); + event.target.classList.add("easing-selected"); + + // Set the easing + this.easing = event.target.dataset.ninjaEase; + this.parentComponent.easing = this.easing; + this.parentComponent.tweenData.easing = this.easing; + + // Unbind the event handler + this.application.ninja.timeline.easingMenu.popup.contentEl.removeEventListener("click"); + + // Hide the menu. + this.hideEasingMenu(); + } }, hideEasingMenu: { - value: function() { - //this.areChoicesVisible = false; - this.application.ninja.timeline.easingMenu.hide(); - } + value: function() { + //this.areChoicesVisible = false; + this.application.ninja.timeline.easingMenu.hide(); + } } }); diff --git a/js/panels/Timeline/Span.reel/scss/Span.scss b/js/panels/Timeline/Span.reel/scss/Span.scss index 12d72cfa..026f266f 100644 --- a/js/panels/Timeline/Span.reel/scss/Span.scss +++ b/js/panels/Timeline/Span.reel/scss/Span.scss @@ -48,10 +48,10 @@ POSSIBILITY OF SUCH DAMAGE. height: 16px; } .tween_span .tween_span_bar { - width: 100%; - height: 100%; - background-color: #fff; - opacity: 0.15; + width: 100%; + height: 100%; + background-color: #fff; + opacity: 0.15; } .tween_span.spanHighlight .tween_span_bar { -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/panels/Timeline/Span.reel/Span.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'js/panels/Timeline/Span.reel') diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index 0b4ab8fc..7c959fad 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.js @@ -51,7 +51,7 @@ var Span = exports.Span = Montage.create(Component, { this.needsDraw = true; } }, - + _isHighlighted: { value: false }, @@ -66,7 +66,7 @@ var Span = exports.Span = Montage.create(Component, { } } }, - + _areChoicesVisible: { value: false }, @@ -81,7 +81,7 @@ var Span = exports.Span = Montage.create(Component, { } } }, - + _easing: { value: "none" }, @@ -102,14 +102,14 @@ var Span = exports.Span = Montage.create(Component, { } } }, - + // BEGIN: draw cycle prepareForDraw: { value: function() { this.init(); } }, - + draw:{ value: function(){ this.element.style.width = this.spanWidth + "px"; @@ -132,14 +132,14 @@ var Span = exports.Span = Montage.create(Component, { this.container_easing.setAttribute("style", ""); this.easing_choice.setAttribute("style", ""); } - + // Highlight the span? if (this.isHighlighted === true) { this.element.classList.add("spanHighlight"); } else { this.element.classList.remove("spanHighlight"); } - + /* // Hide or show the choices menu? if (this.areChoicesVisible === true) { @@ -148,12 +148,12 @@ var Span = exports.Span = Montage.create(Component, { this.easing_choices.style.display = "none"; } */ - + // Change easing? if (this.easing_choice.innerText !== this.easing) { this.easing_choice.innerText = this.easing; } - + } }, @@ -165,7 +165,7 @@ var Span = exports.Span = Montage.create(Component, { } }, - + highlightSpan:{ value: function(){ // Class add/remove should only be done in draw cycle. @@ -173,7 +173,7 @@ var Span = exports.Span = Montage.create(Component, { this.isHighlighted = true; } }, - + handleEasingChoiceClick: { value: function(event) { event.stopPropagation(); @@ -191,7 +191,7 @@ var Span = exports.Span = Montage.create(Component, { do { objReturn.left += obj.offsetLeft; objReturn.top += obj.offsetTop; - + } while (obj = obj.offsetParent); } return objReturn; @@ -209,21 +209,21 @@ var Span = exports.Span = Montage.create(Component, { // Remove the pointer to ourselves //this.application.ninja.timeline.currentOpenSpanMenu = false; - + // Un-highlight the old choice and highlight the new choice this.application.ninja.timeline.easingMenu.popup.contentEl.querySelector(".easing-selected").classList.remove("easing-selected"); event.target.classList.add("easing-selected"); - - // Set the easing + + // Set the easing this.easing = event.target.dataset.ninjaEase; this.parentComponent.easing = this.easing; this.parentComponent.tweenData.easing = this.easing; - + // Unbind the event handler this.application.ninja.timeline.easingMenu.popup.contentEl.removeEventListener("click"); - + // Hide the menu. - this.hideEasingMenu(); + this.hideEasingMenu(); } }, hideEasingMenu: { -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- js/panels/Timeline/Span.reel/scss/Span.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/Timeline/Span.reel') diff --git a/js/panels/Timeline/Span.reel/scss/Span.scss b/js/panels/Timeline/Span.reel/scss/Span.scss index 026f266f..c166114b 100644 --- a/js/panels/Timeline/Span.reel/scss/Span.scss +++ b/js/panels/Timeline/Span.reel/scss/Span.scss @@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. /* Span.scss * Main SCSS file for Span component, compiled by SASS into the file css/Span.css. */ - + // Import theme settings @import "../../../../../scss/imports/themes/default/colors"; // @import "../../../../../scss/imports/themes/default/fonts"; -- cgit v1.2.3 From 9461e7731f91dd03a15b0a62667e722a60c84721 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:44:57 -0700 Subject: Remove byte order markers (BOM) --- js/panels/Timeline/Span.reel/Span.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/Timeline/Span.reel') diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index 0a3e1ab8..9b939866 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html @@ -1,4 +1,4 @@ - +