From: <die...@us...> - 2010-02-05 08:28:28
|
Revision: 1804 http://openutils.svn.sourceforge.net/openutils/?rev=1804&view=rev Author: diego_schivo Date: 2010-02-05 08:28:20 +0000 (Fri, 05 Feb 2010) Log Message: ----------- MEDIA-64 refactoring js Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Removed Paths: ------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-05 08:20:36 UTC (rev 1803) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-05 08:28:20 UTC (rev 1804) @@ -1,5 +1,7 @@ var MediaFolderView = new Class({ initialize: function(){ + new MediaFolderView.InfoTooltips('li.media .image'); + var bgSelectorClickHandler = this.handleBgSelectorClick.bindWithEvent(this); $('navigation').getElements('a.bg-selector').each(function(item){ item.addEvent('click', bgSelectorClickHandler); @@ -10,4 +12,55 @@ e.stop(); document.body.className = e.target.name; } +}); + +MediaFolderView.InfoTooltips = new Class({ + + initialize: function(triggers){ + this.hideStarter = function(){ + this.hideTimer = this.hide.delay(250, this); + }.bind(this); + this.hideStopper = function(){ + if (this.hideTimer) this.hideTimer = $clear(this.hideTimer); + }.bind(this); + $$(triggers).each(function(trigger){ + var tooltip = trigger.tooltip(trigger.getElement('.details').get('html'), { + width: 170, + style: 'alert', + sticky: true, + mode: 'auto', + fixedPosition: true, + offset: {x: -20, y: 110}, + fx: false, + noClose: true + }); + trigger.addEvents({ + 'mouseleave': this.hideStarter, + 'mouseenter': this.hideStopper, + 'tooltipshow': this.handleShow.bind(this, trigger), + 'tooltiphide': this.handleHide.bind(this, trigger) + }); + tooltip.tooltip.addEvents({ + 'mouseenter': this.hideStopper, + 'mouseleave': this.hideStarter + }); + }, this); + }, + + handleShow: function(el){ + this.hideStopper(); + if (this.trigger) this.trigger.tooltip_hide(); + this.trigger = el; + }, + + handleHide: function(el){ + if (this.trigger == el) this.trigger = null; + }, + + hide: function(){ + if (!this.trigger) return; + this.trigger.tooltip_hide(); + this.trigger = null; + } + }); \ No newline at end of file Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js 2010-02-05 08:20:36 UTC (rev 1803) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js 2010-02-05 08:28:20 UTC (rev 1804) @@ -1,50 +0,0 @@ -var MediaInfo = new Class({ - - initialize: function(triggers){ - this.hideStarter = function(){ - this.hideTimer = this.hide.delay(250, this); - }.bind(this); - this.hideStopper = function(){ - if (this.hideTimer) this.hideTimer = $clear(this.hideTimer); - }.bind(this); - $$(triggers).each(function(trigger){ - var tooltip = trigger.tooltip(trigger.getElement('.details').get('html'), { - width: 170, - style: 'alert', - sticky: true, - mode: 'auto', - fixedPosition: true, - offset: {x: -20, y: 110}, - fx: false, - noClose: true - }); - trigger.addEvents({ - 'mouseleave': this.hideStarter, - 'mouseenter': this.hideStopper, - 'tooltipshow': this.handleShow.bind(this, trigger), - 'tooltiphide': this.handleHide.bind(this, trigger) - }); - tooltip.tooltip.addEvents({ - 'mouseenter': this.hideStopper, - 'mouseleave': this.hideStarter - }); - }, this); - }, - - handleShow: function(el){ - this.hideStopper(); - if (this.trigger) this.trigger.tooltip_hide(); - this.trigger = el; - }, - - handleHide: function(el){ - if (this.trigger == el) this.trigger = null; - }, - - hide: function(){ - if (!this.trigger) return; - this.trigger.tooltip_hide(); - this.trigger = null; - } - -}); \ No newline at end of file Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 08:20:36 UTC (rev 1803) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 08:28:20 UTC (rev 1804) @@ -15,7 +15,6 @@ <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/multibox/overlay.js"></script> <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mediaedit.js"></script> <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/sexy-tooltips-1.1.js"></script> - <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mediainfo.js"></script> <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mediafolderview.js"></script> <script type="text/javascript"> [#list this.types as type] @@ -101,7 +100,6 @@ }); new MediaEdit('.edit'); - new MediaInfo('.image'); new MediaFolderView(); }); </script> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |