From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs
---
.../popup-manager.reel/popup-manager.html | 18 +-
js/components/popup-manager.reel/popup-manager.js | 212 ++++++++++-----------
2 files changed, 115 insertions(+), 115 deletions(-)
(limited to 'js/components/popup-manager.reel')
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 281477f1..1a6e9553 100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
@@ -31,10 +31,10 @@ POSSIBILITY OF SUCH DAMAGE.
-->
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js
index 07a07806..a32642b4 100755
--- a/js/components/popup-manager.reel/popup-manager.js
+++ b/js/components/popup-manager.reel/popup-manager.js
@@ -30,144 +30,144 @@ POSSIBILITY OF SUCH DAMAGE.
////////////////////////////////////////////////////////////////////////
//
-var Montage = require("montage/core/core").Montage,
- Component = require("montage/ui/component").Component,
- Popup = require("js/components/popup.reel").Popup;
+var Montage = require("montage/core/core").Montage,
+ Component = require("montage/ui/component").Component,
+ Popup = require("js/components/popup.reel").Popup;
////////////////////////////////////////////////////////////////////////
//Exporting as PopupManager
exports.PopupManager = Montage.create(Component, {
- ////////////////////////////////////////////////////////////////////
- //
+ ////////////////////////////////////////////////////////////////////
+ //
deserializedFromTemplate: {
- value: function () {
- //Setting styles to popup container
- this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
- this.element.style.position = 'absolute';
- this.element.style.top = 0;
- this.element.style.left = 0;
- this.element.style.width = '100%';
- this.element.style.height = '100%';
- //Allowing mouse events to pass through this layer
- this.element.style.pointerEvents = 'none';
- }
+ value: function () {
+ //Setting styles to popup container
+ this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
+ this.element.style.position = 'absolute';
+ this.element.style.top = 0;
+ this.element.style.left = 0;
+ this.element.style.width = '100%';
+ this.element.style.height = '100%';
+ //Allowing mouse events to pass through this layer
+ this.element.style.pointerEvents = 'none';
+ }
},
////////////////////////////////////////////////////////////////////
//Adding the popup object
addPopup: {
- enumerable: true,
- value: function (popup, depth, blackout) {
- //Fix to ensure always highest
- this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
- //TODO: Add blackout background
- //Checking for manual or setting auto to next highest depth
- if (depth) {
- popup.style.zIndex = depth;
- } else {
- popup.style.zIndex = this._getNextHighestZindex(this.element);
- }
- //Adding pointer events (inherits none)
- popup.style.pointerEvents = 'auto';
+ enumerable: true,
+ value: function (popup, depth, blackout) {
+ //Fix to ensure always highest
+ this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
+ //TODO: Add blackout background
+ //Checking for manual or setting auto to next highest depth
+ if (depth) {
+ popup.style.zIndex = depth;
+ } else {
+ popup.style.zIndex = this._getNextHighestZindex(this.element);
+ }
+ //Adding pointer events (inherits none)
+ popup.style.pointerEvents = 'auto';
this.element.appendChild(popup);
- //TODO: Test further (perhaps defined in CSS)
- popup.style.opacity = 0;
- popup.style.webkitTransitionProperty = 'opacity';
- popup.style.webkitTransitionDuration = '150ms';
- //TODO: Fix animation hack
- if (popup.style.webkitTransitionDuration) {
- setTimeout(function () {popup.style.opacity = 1}.bind(this), parseInt(popup.style.webkitTransitionDuration));
- } else {
- popup.style.opacity = 1;
- }
- }
+ //TODO: Test further (perhaps defined in CSS)
+ popup.style.opacity = 0;
+ popup.style.webkitTransitionProperty = 'opacity';
+ popup.style.webkitTransitionDuration = '150ms';
+ //TODO: Fix animation hack
+ if (popup.style.webkitTransitionDuration) {
+ setTimeout(function () {popup.style.opacity = 1}.bind(this), parseInt(popup.style.webkitTransitionDuration));
+ } else {
+ popup.style.opacity = 1;
+ }
+ }
},
////////////////////////////////////////////////////////////////////
//Removing the popup object
removePopup: {
- enumerable: true,
- value: function (popup) {
- popup.style.opacity = 0;
- //TODO: Fix animation hack
- if (popup.style && popup.style.webkitTransitionDuration) {
- setTimeout(function () {this.element.removeChild(popup)}.bind(this), parseInt(popup.style.webkitTransitionDuration));
- } else {
- this.element.removeChild(popup);
- }
- }
+ enumerable: true,
+ value: function (popup) {
+ popup.style.opacity = 0;
+ //TODO: Fix animation hack
+ if (popup.style && popup.style.webkitTransitionDuration) {
+ setTimeout(function () {this.element.removeChild(popup)}.bind(this), parseInt(popup.style.webkitTransitionDuration));
+ } else {
+ this.element.removeChild(popup);
+ }
+ }
},
////////////////////////////////////////////////////////////////////
//Swapping first with second object
swapPopup: {
- enumerable: true,
- value: function (first, second) {
- var f = first.style.zIndex, s = second.style.zIndex;
- //Setting after storing values
- first.style.zIndex = s;
- second.style.zIndex = f;
- }
+ enumerable: true,
+ value: function (first, second) {
+ var f = first.style.zIndex, s = second.style.zIndex;
+ //Setting after storing values
+ first.style.zIndex = s;
+ second.style.zIndex = f;
+ }
},
////////////////////////////////////////////////////////////////////
//Setting Popup to highest z-index
bringToFrontPopup: {
- enumerable: true,
- value: function (popup) {
- popup.style.zIndex = this._getNextHighestZindex(this.element);
- }
+ enumerable: true,
+ value: function (popup) {
+ popup.style.zIndex = this._getNextHighestZindex(this.element);
+ }
},
////////////////////////////////////////////////////////////////////
//
createPopup: {
- enumerable: true,
- value: function (content, position, tooltip) {
- //Creating container for Popup
- var container = document.createElement('div');
- var pop = Popup.create();
- //Setting container and content
- pop.element = container;
- pop.content = content;
- //Checking for optional parameters
- if (position)
- pop.position = position;
- if (tooltip)
- pop.tooltip = tooltip;
- //Adding Popup to view
- this.addPopup(container);
- pop.needsDraw = true;
- //Returns pop component
- return pop;
- }
+ enumerable: true,
+ value: function (content, position, tooltip) {
+ //Creating container for Popup
+ var container = document.createElement('div');
+ var pop = Popup.create();
+ //Setting container and content
+ pop.element = container;
+ pop.content = content;
+ //Checking for optional parameters
+ if (position)
+ pop.position = position;
+ if (tooltip)
+ pop.tooltip = tooltip;
+ //Adding Popup to view
+ this.addPopup(container);
+ pop.needsDraw = true;
+ //Returns pop component
+ return pop;
+ }
},
////////////////////////////////////////////////////////////////////
//Accepts parent to scan for z-index and returns highest children
_getNextHighestZindex: {
- numerable: false,
- value: function (parent) {
- //CSS specificity in javascript found at http://gbradley.com/2009/10/02/css-specificity-in-javascript used with permission from Graham Bradley
- var high = 0, current = 0, children = [], i;
- //
- if (parent) {
- children = parent.getElementsByTagName('*');
- } else {
- children = document.getElementsByTagName('*');
- }
- //
- for (i=0; children[i]; i++) {
- if (children[i].currentStyle) {
- current = parseFloat(children[i].currentStyle['zIndex']);
- } else if (window.getComputedStyle) {
- current = parseFloat(document.defaultView.getComputedStyle(children[i],null).getPropertyValue('z-index'));
- }
- if(!isNaN(current) && current > high){
- high = current;
- }
- }
- //
- return (high+10);
- }
- },
+ numerable: false,
+ value: function (parent) {
+ //CSS specificity in javascript found at http://gbradley.com/2009/10/02/css-specificity-in-javascript used with permission from Graham Bradley
+ var high = 0, current = 0, children = [], i;
+ //
+ if (parent) {
+ children = parent.getElementsByTagName('*');
+ } else {
+ children = document.getElementsByTagName('*');
+ }
+ //
+ for (i=0; children[i]; i++) {
+ if (children[i].currentStyle) {
+ current = parseFloat(children[i].currentStyle['zIndex']);
+ } else if (window.getComputedStyle) {
+ current = parseFloat(document.defaultView.getComputedStyle(children[i],null).getPropertyValue('z-index'));
+ }
+ if(!isNaN(current) && current > high){
+ high = current;
+ }
+ }
+ //
+ return (high+10);
+ }
+ },
////////////////////////////////////////////////////////////////////
//Dispatching "Change" event
_dispatchpopupEvent: {
- enumerable: false,
+ enumerable: false,
value: function() {
var popupEvent = document.createEvent("CustomEvent");
popupEvent.initEvent("change", true, true);
--
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/components/popup-manager.reel/popup-manager.html | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'js/components/popup-manager.reel')
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 1a6e9553..102c81d0 100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
@@ -1,5 +1,5 @@
-
-
+
-
+
-
+
-
+
-
+
-
+
--
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/components/popup-manager.reel/popup-manager.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/components/popup-manager.reel')
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 102c81d0..e27a7599 100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
@@ -1,4 +1,4 @@
-
+