From f48416d68e2762ece2816e7e2387f0aa3ffa797f Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Sun, 17 Jun 2012 14:52:20 -0700 Subject: Cleaning up element references --- js/components/popup.reel/popup.html | 8 +++++--- js/components/popup.reel/popup.js | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'js/components/popup.reel') diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html index cc31106e..2262289c 100755 --- a/js/components/popup.reel/popup.html +++ b/js/components/popup.reel/popup.html @@ -16,7 +16,9 @@ "owner": { "prototype": "js/components/Popup.reel", "properties": { - "element": {"#": "default_popup"} + "element": {"#": "default_popup"}, + "popupTooltip": {"#": "tooltip"}, + "popupContent": {"#": "content"} } } } @@ -27,8 +29,8 @@

- -

+ +

diff --git a/js/components/popup.reel/popup.js b/js/components/popup.reel/popup.js index ae483ea9..2d89db13 100755 --- a/js/components/popup.reel/popup.js +++ b/js/components/popup.reel/popup.js @@ -104,7 +104,7 @@ exports.Popup = Montage.create(Component, { if (!this._content.style.float) { this._content.style.float = 'left'; } - this.element.getElementsByClassName('content')[0].appendChild(this._content); + this.popupContent.appendChild(this._content); // if (!this.tooltip) { this.tooltip = {}; @@ -113,16 +113,16 @@ exports.Popup = Montage.create(Component, { } switch (this.tooltip.side.toLowerCase()) { case 'top': - this.element.style.marginTop = (this.element.getElementsByClassName('tooltip')[0].clientHeight) + 'px'; + this.element.style.marginTop = (this.popupTooltip.clientHeight) + 'px'; break; case 'bottom': - this.element.style.marginTop = -(this.element.clientHeight+(this.element.getElementsByClassName('tooltip')[0].clientHeight)) + 'px'; + this.element.style.marginTop = -(this.element.clientHeight+(this.popupTooltip.clientHeight)) + 'px'; break; case 'left': - this.element.style.marginLeft = (this.element.getElementsByClassName('tooltip')[0].clientWidth) + 'px'; + this.element.style.marginLeft = (this.popupTooltip.clientWidth) + 'px'; break; case 'right': - this.element.style.marginLeft = -(this.element.clientWidth + this.element.getElementsByClassName('tooltip')[0].clientWidth) + 'px'; + 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"); @@ -131,22 +131,22 @@ exports.Popup = Montage.create(Component, { // switch (this.tooltip.align.toLowerCase()) { case 'top': - this.element.style.marginTop = -Math.round((this.element.getElementsByClassName('tooltip')[0].clientHeight/2)+this.element.getElementsByClassName('tooltip')[0].offsetTop) + 'px'; + 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.element.getElementsByClassName('tooltip')[0].offsetTop)-(this.element.getElementsByClassName('tooltip')[0].clientHeight/2))) + 'px'; + 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.element.getElementsByClassName('tooltip')[0].offsetLeft)-(this.element.getElementsByClassName('tooltip')[0].clientWidth/2))) + 'px'; + 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.element.getElementsByClassName('tooltip')[0].clientWidth) + 'px'; + 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.element.getElementsByClassName('tooltip')[0].offsetLeft)-(this.element.getElementsByClassName('tooltip')[0].clientWidth/2))) + 'px'; + 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.element.getElementsByClassName('tooltip')[0].offsetTop)-(this.element.getElementsByClassName('tooltip')[0].clientHeight/2))) + 'px'; + 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"); @@ -170,7 +170,7 @@ exports.Popup = Montage.create(Component, { enumerable: true, value: function () { // - var longD = '22px', shortD = '10px', shortP = '-10px', longP = '8px', tip = this.element.getElementsByClassName('tooltip')[0]; + var longD = '22px', shortD = '10px', shortP = '-10px', longP = '8px', tip = this.popupTooltip; // if (this.tooltip && this.tooltip.side) { switch (this.tooltip.side.toLowerCase()) { -- cgit v1.2.3