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/EasingMenu.reel/EasingMenu.html | 34 ++-- js/panels/Timeline/EasingMenu.reel/EasingMenu.js | 190 ++++++++++----------- 2 files changed, 112 insertions(+), 112 deletions(-) (limited to 'js/panels/Timeline/EasingMenu.reel') diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html index dcf35d8f..b8a3f9f3 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html @@ -29,10 +29,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - - - - - - -
- -
+ + +
+ +
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js index 6d41afb0..0c105d0a 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js @@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE. */ var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component, - Popup = require("montage/ui/popup/popup.reel").Popup; + Component = require("montage/ui/component").Component, + Popup = require("montage/ui/popup/popup.reel").Popup; var EasingMenu = exports.EasingMenu = Montage.create(Component, { @@ -38,125 +38,125 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, { value: true }, - /* Begin: Models */ - - // popup: the initialized component. + /* Begin: Models */ + + // popup: the initialized component. _popup: { - value: null + value: null }, popup: { - get: function() { - return this._popup; - }, - set: function(newVal) { - this._popup = newVal - } + get: function() { + return this._popup; + }, + set: function(newVal) { + this._popup = newVal + } }, // callingComponent: pointer to the span that called for the menu _callingComponent: { - value: null + value: null }, callingComponent: { - get: function() { - return this._callingComponent; - }, - set: function(newVal) { - this._callingComponent = newVal; - } + get: function() { + return this._callingComponent; + }, + set: function(newVal) { + this._callingComponent = newVal; + } }, // anchor: pointer to the anchoring element _anchor: { - value: null + value: null }, anchor: { - get: function() { - return this._anchor; - }, - set: function(newVal) { - this._anchor = newVal; - } + get: function() { + return this._anchor; + }, + set: function(newVal) { + this._anchor = newVal; + } }, _top: { - value: null + value: null }, top: { - get: function() { - return this._top; - }, - set: function(newVal) { - this._top = newVal; - } + get: function() { + return this._top; + }, + set: function(newVal) { + this._top = newVal; + } }, _left: { - value: null + value: null }, left: { - get: function() { - return this._left; - }, - set: function(newVal) { - this._left = newVal; - } + get: function() { + return this._left; + }, + set: function(newVal) { + this._left = newVal; + } }, // currentChoice: The data attribute of the current choice _currentChoice: { - value: "none" + value: "none" }, currentChoice: { - get: function() { - return this._currentChoice; - }, - set: function(newVal) { - this._currentChoice = newVal; - } + get: function() { + return this._currentChoice; + }, + set: function(newVal) { + this._currentChoice = newVal; + } }, _isShown: { - value: false + value: false }, /* End: Models */ /* Begin: Draw Cycle */ willDraw: { - value: function() { - this.element.addEventListener("click", this.handleEasingChoicesClick.bind(this), false); - document.addEventListener("scroll", this.handleDocumentScroll.bind(this), false); - } + value: function() { + this.element.addEventListener("click", this.handleEasingChoicesClick.bind(this), false); + document.addEventListener("scroll", this.handleDocumentScroll.bind(this), false); + } }, draw: { - value: function() { - // Update the selection classes. - var easingSelected = this.element.querySelector(".easing-selected"); - if (easingSelected !== null) { - easingSelected.classList.remove("easing-selected"); - } + value: function() { + // Update the selection classes. + var easingSelected = this.element.querySelector(".easing-selected"); + if (easingSelected !== null) { + easingSelected.classList.remove("easing-selected"); + } var dataEl = this.element.querySelector('[data-ninja-ease="'+this.currentChoice+'"]'); if (dataEl !== null) { - dataEl.classList.add("easing-selected"); + dataEl.classList.add("easing-selected"); } - } + } }, didDraw: { - value: function() { - } + value: function() { + } }, - /* End Draw Cycle */ + /* End Draw Cycle */ /* Begin: Controllers */ - show: { - value: function() { - // Initialize the popup if it hasn't already been done + show: { + value: function() { + // Initialize the popup if it hasn't already been done if (this.popup == null) { - this.popup = Popup.create(); - this.popup.modal = false; - this.popup.content = EasingMenu.create(); + this.popup = Popup.create(); + this.popup.modal = false; + this.popup.content = EasingMenu.create(); } // Show the popup @@ -170,34 +170,34 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, { // Redraw the content (needed to reflect probable changes in selection from the last time we showed it) this.popup.content.needsDraw = true; - } - }, - handleEasingChoicesClick: { - value: function(event) { - event.stopPropagation(); + } + }, + handleEasingChoicesClick: { + value: function(event) { + event.stopPropagation(); - // Un-highlight the old choice and highlight the new choice - var easingSelected = this.element.querySelector(".easing-selected"); - if (easingSelected !== null) { - easingSelected.classList.remove("easing-selected"); - } - event.target.classList.add("easing-selected"); - - // Set the easing in the span that called us - this.callingComponent.easing = event.target.dataset.ninjaEase; - - // Hide the menu. - this.popup.hide(); - this._isShow = false; - } + // Un-highlight the old choice and highlight the new choice + var easingSelected = this.element.querySelector(".easing-selected"); + if (easingSelected !== null) { + easingSelected.classList.remove("easing-selected"); + } + event.target.classList.add("easing-selected"); + + // Set the easing in the span that called us + this.callingComponent.easing = event.target.dataset.ninjaEase; + + // Hide the menu. + this.popup.hide(); + this._isShow = false; + } }, - handleDocumentScroll: { - value: function(event) { - if (this._isShow = true) { - this.popup.hide(); - } - } - } + handleDocumentScroll: { + value: function(event) { + if (this._isShow = true) { + this.popup.hide(); + } + } + } /* End: Controllers */ -- cgit v1.2.3