Module: nagvis Branch: master Commit: 1d17d74cf01741412b6818c9473c2e8aaa0fd4a8 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=1d17d74cf01741412b6818c9473c2e8aaa0fd4a8
Author: Lars Michelsen <[email protected]> Date: Sat Aug 28 11:05:41 2010 +0200 Object name cleanup --- share/frontend/nagvis-js/js/NagVisLine.js | 15 ++++++--------- .../frontend/nagvis-js/js/NagVisStatefulObject.js | 4 ++-- share/frontend/nagvis-js/js/lines.js | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/share/frontend/nagvis-js/js/NagVisLine.js b/share/frontend/nagvis-js/js/NagVisLine.js index b07eb19..4c987a5 100644 --- a/share/frontend/nagvis-js/js/NagVisLine.js +++ b/share/frontend/nagvis-js/js/NagVisLine.js @@ -85,16 +85,13 @@ var NagVisLine = NagVisStatelessObject.extend({ // Parse hover/link area only when needed if((this.conf.url && this.conf.url !== '') || (this.conf.hover_menu && this.conf.hover_menu !== '')) { - var oLinkDiv = document.createElement('div'); + var oLink = document.createElement('a'); + oLink.setAttribute('id', this.conf.object_id+'-linelink'); + oLink.href = this.conf.url; + oLink.target = this.conf.url_target; - oLinkDiv.setAttribute('id', this.conf.object_id+'-linelinkdiv'); - oLinkDiv.style.zIndex = (this.conf.z+1); - var sUrl = this.conf.url; - var sUrlTarget = this.conf.url_target; - oLinkDiv.onclick = function() { window.open(sUrl, sUrlTarget, ""); }; - - oContainerDiv.appendChild(oLinkDiv); - oLinkDiv = null; + oContainerDiv.appendChild(oLink); + oLink = null; } return oContainerDiv; diff --git a/share/frontend/nagvis-js/js/NagVisStatefulObject.js b/share/frontend/nagvis-js/js/NagVisStatefulObject.js index a9825cc..4eb96cc 100644 --- a/share/frontend/nagvis-js/js/NagVisStatefulObject.js +++ b/share/frontend/nagvis-js/js/NagVisStatefulObject.js @@ -329,7 +329,7 @@ var NagVisStatefulObject = NagVisObject.extend({ */ parseHoverMenu: function () { if(this.conf.view_type && this.conf.view_type === 'line') - this.getHoverMenu(this.conf.object_id+'-linelinkdiv'); + this.getHoverMenu(this.conf.object_id+'-linelink'); else this.getHoverMenu(this.conf.object_id+'-icon'); }, @@ -454,7 +454,7 @@ var NagVisStatefulObject = NagVisObject.extend({ // Parse hover/link area only when needed if((this.conf.url && this.conf.url !== '') || (this.conf.hover_menu && this.conf.hover_menu !== '')) { var oLink = document.createElement('a'); - oLink.setAttribute('id', this.conf.object_id+'-linelinkdiv'); + oLink.setAttribute('id', this.conf.object_id+'-linelink'); oLink.href = this.conf.url; oLink.target = this.conf.url_target; diff --git a/share/frontend/nagvis-js/js/lines.js b/share/frontend/nagvis-js/js/lines.js index c200c7d..51ca72e 100644 --- a/share/frontend/nagvis-js/js/lines.js +++ b/share/frontend/nagvis-js/js/lines.js @@ -122,7 +122,7 @@ function drawPolygonBasedObject(objectId, lineType, xCoord, yCoord, z, w, colorF // ------------------------------------------------------------------------- if(bLinkArea && bLinkArea === true) { - var oLinkContainer = document.getElementById(objectId+'-linelinkdiv'); + var oLinkContainer = document.getElementById(objectId+'-linelink'); var labelShift = 10; if(lineType == '13' || lineType == '14') { ------------------------------------------------------------------------------ Sell apps to millions through the Intel(R) Atom(Tm) Developer Program Be part of this innovative community and reach millions of netbook users worldwide. Take advantage of special opportunities to increase revenue and speed time-to-market. Join now, and jumpstart your future. http://p.sf.net/sfu/intel-atom-d2d _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
