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/components/popup.reel/css/popup.scss | 54 ++---
js/components/popup.reel/popup.html | 28 +--
js/components/popup.reel/popup.js | 336 ++++++++++++++++----------------
3 files changed, 209 insertions(+), 209 deletions(-)
(limited to 'js/components/popup.reel')
diff --git a/js/components/popup.reel/css/popup.scss b/js/components/popup.reel/css/popup.scss
index 75ff2814..4f40b7c8 100755
--- a/js/components/popup.reel/css/popup.scss
+++ b/js/components/popup.reel/css/popup.scss
@@ -34,43 +34,43 @@ $grey_light: #494949;
.default_popup
{
- //MUST HAVE TO ALLOW FOR SIZE AJUSTMENTS
- position: absolute;
- width: auto;
- float: left;
-
- //TEXT STYLES
- font-family: 'Droid Sans', sans-serif;
- color: #FFF;
-
- //BACKGROUND AND CONTAINER
- background: $grey_light;
- border: 1px solid $grey_dark;
- border-radius: 8px;
- padding: 8px;
- box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
- pointerEvents: auto;
+ //MUST HAVE TO ALLOW FOR SIZE AJUSTMENTS
+ position: absolute;
+ width: auto;
+ float: left;
+
+ //TEXT STYLES
+ font-family: 'Droid Sans', sans-serif;
+ color: #FFF;
+
+ //BACKGROUND AND CONTAINER
+ background: $grey_light;
+ border: 1px solid $grey_dark;
+ border-radius: 8px;
+ padding: 8px;
+ box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+ pointerEvents: auto;
}
.default_popup .content
{
- overflow: auto;
- float: left;
+ overflow: auto;
+ float: left;
}
.default_popup .tooltip
{
- position: absolute;
- overflow: hidden;
+ position: absolute;
+ overflow: hidden;
}
.default_popup .tooltip span
{
- -webkit-transform:rotate(45deg);
- width: 12px;
- height: 12px;
- margin: 3px;
- display: block;
- background: $grey_light;
- border: 1px solid $grey_dark;
+ -webkit-transform:rotate(45deg);
+ width: 12px;
+ height: 12px;
+ margin: 3px;
+ display: block;
+ background: $grey_light;
+ border: 1px solid $grey_dark;
}
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index ee468827..9729b2cc 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -29,11 +29,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-->
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
-
+
-
+
+
+
diff --git a/js/components/popup.reel/popup.js b/js/components/popup.reel/popup.js
index c66a39fa..f9f38a3c 100755
--- a/js/components/popup.reel/popup.js
+++ b/js/components/popup.reel/popup.js
@@ -30,237 +30,237 @@ POSSIBILITY OF SUCH DAMAGE.
////////////////////////////////////////////////////////////////////////
//
-var Montage = require("montage/core/core").Montage,
- Component = require("montage/ui/component").Component;
+var Montage = require("montage/core/core").Montage,
+ Component = require("montage/ui/component").Component;
////////////////////////////////////////////////////////////////////////
//Exporting as Popup
exports.Popup = Montage.create(Component, {
- ////////////////////////////////////////////////////////////////////
- //
- hasTemplate: {
+ ////////////////////////////////////////////////////////////////////
+ //
+ hasTemplate: {
value: true
},
////////////////////////////////////////////////////////////////////
//
_content: {
- numerable: false,
- value: null
+ numerable: false,
+ value: null
},
////////////////////////////////////////////////////////////////////
//
content: {
- enumerable: true,
+ enumerable: true,
get: function() {
return this._content;
},
set: function(value) {
- this._content = value;
+ this._content = value;
}
},
////////////////////////////////////////////////////////////////////
//
_position: {
- numerable: false,
- value: null
+ numerable: false,
+ value: null
},
////////////////////////////////////////////////////////////////////
//Position is set with X,Y Coordinates from Top and Left respetively
position: {
- enumerable: true,
+ enumerable: true,
get: function() {
return this._position;
},
set: function(value) {
- this._position = value;
- if (value.x) {
- this.element.style.left = value.x;
- }
- if (value.y) {
- this.element.style.top = value.y;
- }
+ this._position = value;
+ if (value.x) {
+ this.element.style.left = value.x;
+ }
+ if (value.y) {
+ this.element.style.top = value.y;
+ }
}
},
////////////////////////////////////////////////////////////////////
//
_tooltip: {
- numerable: false,
- value: null
+ numerable: false,
+ value: null
},
////////////////////////////////////////////////////////////////////
//
tooltip: {
- enumerable: true,
+ enumerable: true,
get: function() {
return this._tooltip;
},
set: function(value) {
- this._tooltip = value;
+ this._tooltip = value;
}
},
////////////////////////////////////////////////////////////////////
//
prepareForDraw: {
- enumerable: false,
- value: function() {
- this.element.style.pointerEvents = 'auto';
- }
+ enumerable: false,
+ value: function() {
+ this.element.style.pointerEvents = 'auto';
+ }
},
////////////////////////////////////////////////////////////////////
//
willDraw: {
- enumerable: false,
- value: function() {
- //
- }
+ enumerable: false,
+ value: function() {
+ //
+ }
},
////////////////////////////////////////////////////////////////////
//
draw: {
- enumerable: false,
- value: function() {
- //
- if (!this._content) {
- return;
- }
- if (!this._content.style.width) {
- this._content.style.width = 'auto';
- }
- if (!this._content.style.float) {
- this._content.style.float = 'left';
- }
- this.popupContent.appendChild(this._content);
- //
- if (!this.tooltip) {
- this.tooltip = {};
- this.tooltip.side = 'none';
- this.tooltip.align = 'none';
- }
- switch (this.tooltip.side.toLowerCase()) {
- case 'top':
- this.element.style.marginTop = (this.popupTooltip.clientHeight) + 'px';
- break;
- case 'bottom':
- this.element.style.marginTop = -(this.element.clientHeight+(this.popupTooltip.clientHeight)) + 'px';
- break;
- case 'left':
- this.element.style.marginLeft = (this.popupTooltip.clientWidth) + 'px';
- break;
- case 'right':
- this.element.style.marginLeft = -(this.element.clientWidth + this.popupTooltip.clientWidth) + 'px';
- break;
- default:
- //console.log("Error: Tooltip side value of "+this.tooltip.side.toLowerCase()+" property not allowed");
- break;
- }
- //
- switch (this.tooltip.align.toLowerCase()) {
- case 'top':
- this.element.style.marginTop = -Math.round((this.popupTooltip.clientHeight/2)+this.popupTooltip.offsetTop) + 'px';
- break;
- case 'bottom':
- this.element.style.marginTop = -Math.round(this.element.clientHeight-((this.element.clientHeight - this.popupTooltip.offsetTop)-(this.popupTooltip.clientHeight/2))) + 'px';
- break;
- case 'left':
- this.element.style.marginLeft = -Math.round(this.element.clientWidth-((this.element.clientWidth - this.popupTooltip.offsetLeft)-(this.popupTooltip.clientWidth/2))) + 'px';
- break;
- case 'right':
- this.element.style.marginLeft = -(this.element.clientWidth - this.popupTooltip.clientWidth) + 'px';
- break;
- case 'center':
- this.element.style.marginLeft = -Math.round(this.element.clientWidth/2-((this.element.clientWidth/2 - this.popupTooltip.offsetLeft)-(this.popupTooltip.clientWidth/2))) + 'px';
- break;
- case 'middle':
- this.element.style.marginTop = -Math.round(this.element.clientHeight/2-((this.element.clientHeight/2 - this.popupTooltip.offsetTop)-(this.popupTooltip.clientHeight/2))) + 'px';
- break;
- default:
- //console.log("Error: Tooltip align value of "+this.tooltip.align.toLowerCase()+" property not allowed");
- break;
- }
- //
- this.drawTooltip();
- }
+ enumerable: false,
+ value: function() {
+ //
+ if (!this._content) {
+ return;
+ }
+ if (!this._content.style.width) {
+ this._content.style.width = 'auto';
+ }
+ if (!this._content.style.float) {
+ this._content.style.float = 'left';
+ }
+ this.popupContent.appendChild(this._content);
+ //
+ if (!this.tooltip) {
+ this.tooltip = {};
+ this.tooltip.side = 'none';
+ this.tooltip.align = 'none';
+ }
+ switch (this.tooltip.side.toLowerCase()) {
+ case 'top':
+ this.element.style.marginTop = (this.popupTooltip.clientHeight) + 'px';
+ break;
+ case 'bottom':
+ this.element.style.marginTop = -(this.element.clientHeight+(this.popupTooltip.clientHeight)) + 'px';
+ break;
+ case 'left':
+ this.element.style.marginLeft = (this.popupTooltip.clientWidth) + 'px';
+ break;
+ case 'right':
+ this.element.style.marginLeft = -(this.element.clientWidth + this.popupTooltip.clientWidth) + 'px';
+ break;
+ default:
+ //console.log("Error: Tooltip side value of "+this.tooltip.side.toLowerCase()+" property not allowed");
+ break;
+ }
+ //
+ switch (this.tooltip.align.toLowerCase()) {
+ case 'top':
+ this.element.style.marginTop = -Math.round((this.popupTooltip.clientHeight/2)+this.popupTooltip.offsetTop) + 'px';
+ break;
+ case 'bottom':
+ this.element.style.marginTop = -Math.round(this.element.clientHeight-((this.element.clientHeight - this.popupTooltip.offsetTop)-(this.popupTooltip.clientHeight/2))) + 'px';
+ break;
+ case 'left':
+ this.element.style.marginLeft = -Math.round(this.element.clientWidth-((this.element.clientWidth - this.popupTooltip.offsetLeft)-(this.popupTooltip.clientWidth/2))) + 'px';
+ break;
+ case 'right':
+ this.element.style.marginLeft = -(this.element.clientWidth - this.popupTooltip.clientWidth) + 'px';
+ break;
+ case 'center':
+ this.element.style.marginLeft = -Math.round(this.element.clientWidth/2-((this.element.clientWidth/2 - this.popupTooltip.offsetLeft)-(this.popupTooltip.clientWidth/2))) + 'px';
+ break;
+ case 'middle':
+ this.element.style.marginTop = -Math.round(this.element.clientHeight/2-((this.element.clientHeight/2 - this.popupTooltip.offsetTop)-(this.popupTooltip.clientHeight/2))) + 'px';
+ break;
+ default:
+ //console.log("Error: Tooltip align value of "+this.tooltip.align.toLowerCase()+" property not allowed");
+ break;
+ }
+ //
+ this.drawTooltip();
+ }
},
////////////////////////////////////////////////////////////////////
//
didDraw: {
- enumerable: false,
- value: function() {
- //Removed own event, relying on firstDraw event of m-js
- }
+ enumerable: false,
+ value: function() {
+ //Removed own event, relying on firstDraw event of m-js
+ }
},
////////////////////////////////////////////////////////////////////
//
drawTooltip: {
- enumerable: true,
- value: function () {
- //
- var longD = '22px', shortD = '10px', shortP = '-10px', longP = '8px', tip = this.popupTooltip;
- //
- if (this.tooltip && this.tooltip.side) {
- switch (this.tooltip.side.toLowerCase()) {
- case 'top':
- tip.style.top = shortP;
- tip.style.height = shortD;
- tip.style.width = longD;
- break;
- case 'bottom':
- tip.style.bottom = shortP;
- tip.style.height = shortD;
- tip.style.width = longD;
- tip.getElementsByTagName('span')[0].style.marginTop = '-6px';
- break;
- case 'left':
- tip.style.left = shortP;
- tip.style.width = shortD;
- tip.style.height = longD;
- //this.element.style.left = parseInt(this.element.style.left) + parseInt(tip.style.width) + 'px';
- break;
- case 'right':
- tip.style.right = shortP;
- tip.style.width = shortD;
- tip.style.height = longD;
- tip.getElementsByTagName('span')[0].style.marginLeft = '-6px';
- break;
- default:
- tip.style.display = 'none';
- //console.log("Error: Tooltip side value of "+this.tooltip.side.toLowerCase()+" property not allowed");
- break;
- }
- } else {
- tip.style.display = 'none';
- }
- //
- if (this.tooltip && this.tooltip.align) {
- switch (this.tooltip.align.toLowerCase()) {
- case 'top':
- tip.style.top = longP;
- break;
- case 'bottom':
- tip.style.bottom = longP;
- break;
- case 'left':
- tip.style.left = longP;
- break;
- case 'right':
- tip.style.right = longP;
- break;
- case 'center':
- tip.style.left = '50%';
- tip.style.marginLeft = -Math.round(parseFloat(tip.style.width)/2)+'px';
- break;
- case 'middle':
- tip.style.top = '50%';
- tip.style.marginTop = -Math.round(parseFloat(tip.style.height)/2)+'px';
- break;
- default:
- tip.style.display = 'none';
- //console.log("Error: Tooltip align value of "+this.tooltip.align.toLowerCase()+" property not allowed");
- break;
- }
- } else {
- tip.style.display = 'none';
- }
- }
+ enumerable: true,
+ value: function () {
+ //
+ var longD = '22px', shortD = '10px', shortP = '-10px', longP = '8px', tip = this.popupTooltip;
+ //
+ if (this.tooltip && this.tooltip.side) {
+ switch (this.tooltip.side.toLowerCase()) {
+ case 'top':
+ tip.style.top = shortP;
+ tip.style.height = shortD;
+ tip.style.width = longD;
+ break;
+ case 'bottom':
+ tip.style.bottom = shortP;
+ tip.style.height = shortD;
+ tip.style.width = longD;
+ tip.getElementsByTagName('span')[0].style.marginTop = '-6px';
+ break;
+ case 'left':
+ tip.style.left = shortP;
+ tip.style.width = shortD;
+ tip.style.height = longD;
+ //this.element.style.left = parseInt(this.element.style.left) + parseInt(tip.style.width) + 'px';
+ break;
+ case 'right':
+ tip.style.right = shortP;
+ tip.style.width = shortD;
+ tip.style.height = longD;
+ tip.getElementsByTagName('span')[0].style.marginLeft = '-6px';
+ break;
+ default:
+ tip.style.display = 'none';
+ //console.log("Error: Tooltip side value of "+this.tooltip.side.toLowerCase()+" property not allowed");
+ break;
+ }
+ } else {
+ tip.style.display = 'none';
+ }
+ //
+ if (this.tooltip && this.tooltip.align) {
+ switch (this.tooltip.align.toLowerCase()) {
+ case 'top':
+ tip.style.top = longP;
+ break;
+ case 'bottom':
+ tip.style.bottom = longP;
+ break;
+ case 'left':
+ tip.style.left = longP;
+ break;
+ case 'right':
+ tip.style.right = longP;
+ break;
+ case 'center':
+ tip.style.left = '50%';
+ tip.style.marginLeft = -Math.round(parseFloat(tip.style.width)/2)+'px';
+ break;
+ case 'middle':
+ tip.style.top = '50%';
+ tip.style.marginTop = -Math.round(parseFloat(tip.style.height)/2)+'px';
+ break;
+ default:
+ tip.style.display = 'none';
+ //console.log("Error: Tooltip align value of "+this.tooltip.align.toLowerCase()+" property not allowed");
+ break;
+ }
+ } else {
+ tip.style.display = 'none';
+ }
+ }
}
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
--
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.reel/css/popup.scss | 4 ++--
js/components/popup.reel/popup.html | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'js/components/popup.reel')
diff --git a/js/components/popup.reel/css/popup.scss b/js/components/popup.reel/css/popup.scss
index 4f40b7c8..fc959b84 100755
--- a/js/components/popup.reel/css/popup.scss
+++ b/js/components/popup.reel/css/popup.scss
@@ -38,11 +38,11 @@ $grey_light: #494949;
position: absolute;
width: auto;
float: left;
-
+
//TEXT STYLES
font-family: 'Droid Sans', sans-serif;
color: #FFF;
-
+
//BACKGROUND AND CONTAINER
background: $grey_light;
border: 1px solid $grey_dark;
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index 9729b2cc..ede18a52 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE.
-->
-
+
-
+
-
+
-
+
-
+
-
+
--
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.reel/popup.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/components/popup.reel')
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index ede18a52..d4d8a375 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -1,4 +1,4 @@
-
+