You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/03/27 21:18:47 UTC
svn commit: r389227 - in
/portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget:
HtmlFloatingPane.html PortalTaskBar.js
Author: taylor
Date: Mon Mar 27 11:18:44 2006
New Revision: 389227
URL: http://svn.apache.org/viewcvs?rev=389227&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-514
continued contributions on desktop, portlet themes from Steve Milek
Modified:
portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/HtmlFloatingPane.html
portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/PortalTaskBar.js
Modified: portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/HtmlFloatingPane.html
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/HtmlFloatingPane.html?rev=389227&r1=389226&r2=389227&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/HtmlFloatingPane.html (original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/HtmlFloatingPane.html Mon Mar 27 11:18:44 2006
@@ -1,15 +1,15 @@
<div id="${this.widgetId}" class="dojoFloatingPane" datasrc="${this.blee}" dojoAttachEvent="onMouseDown">
<div dojoAttachPoint="titleBar" class="dojoFloatingPaneTitleBar" style="display:none" dojoAttachEvent="onMouseOver:titleMouseOver;onMouseOut:titleMouseOut">
<img dojoAttachPoint="titleBarIcon" src="${this.iconSrc}" class="dojoTitleBarIcon">
- <div dojoAttachPoint="closeAction" dojoAttachEvent="onClick:closeWindow;onMouseOver:titleMouseOver;onMouseOut:titleMouseOut"
- class="dojoFloatingPaneCloseIcon"></div>
- <div dojoAttachPoint="restoreAction" dojoAttachEvent="onClick:restoreWindow;onMouseOver:titleMouseOver;onMouseOut:titleMouseOut"
- class="dojoFloatingPaneRestoreIcon"></div>
- <div dojoAttachPoint="maximizeAction" dojoAttachEvent="onClick:maximizeWindow;onMouseOver:titleMouseOver;onMouseOut:titleMouseOut"
- class="dojoFloatingPaneMaximizeIcon"></div>
- <div dojoAttachPoint="minimizeAction" dojoAttachEvent="onClick:minimizeWindow;onMouseOver:titleMouseOver;onMouseOut:titleMouseOut"
- class="dojoFloatingPaneMinimizeIcon"></div>
- <div dojoAttachPoint="titleBarText" class="dojoFloatingPaneTitleText">${this.title}</div>
+ <div class="dojoFloatingPaneCloseIcon" dojoAttachPoint="closeAction" dojoAttachEvent="onClick:closeWindow"></div>
+ <!-- dojoAttachEvent="onClick:closeWindow;onMouseOver:titleMouseOver;onMouseOut:titleMouseOut"></div> -->
+ <div class="dojoFloatingPaneRestoreIcon" dojoAttachPoint="restoreAction" dojoAttachEvent="onClick:restoreWindow"></div>
+ <!-- dojoAttachEvent="onClick:restoreWindow;onMouseOver:titleMouseOver;onMouseOut:titleMouseOut"></div> -->
+ <div class="dojoFloatingPaneMaximizeIcon" dojoAttachPoint="maximizeAction" dojoAttachEvent="onClick:maximizeWindow"></div>
+ <!-- dojoAttachEvent="onClick:maximizeWindow;onMouseOver:titleMouseOver;onMouseOut:titleMouseOut"></div> -->
+ <div class="dojoFloatingPaneMinimizeIcon" dojoAttachPoint="minimizeAction" dojoAttachEvent="onClick:minimizeWindow"></div>
+ <!-- dojoAttachEvent="onClick:minimizeWindow;onMouseOver:titleMouseOver;onMouseOut:titleMouseOut"></div> -->
+ <div class="dojoFloatingPaneTitleText" dojoAttachPoint="titleBarText">${this.title}</div>
</div>
<div dojoAttachPoint="containerNodeWrapper"
Modified: portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/PortalTaskBar.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/PortalTaskBar.js?rev=389227&r1=389226&r2=389227&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/PortalTaskBar.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/desktop/widget/PortalTaskBar.js Mon Mar 27 11:18:44 2006
@@ -53,15 +53,33 @@
},
onClick: function() {
var showWindow = this.window;
+ var showWindowNode = showWindow.domNode;
var btnNode = this.domNode;
- // simulate button click
- dojo.fx.html.fade( this.domNode, 100, 1, 0.5, function() { dojo.fx.html.fade( btnNode, 100, 0.5, 1 ); } );
+ // sequencing these effects makes IE happier
+ // - we fadeOut the button to 50% opacity
+ // - we fadeIn the button back to normal
+ // - we explode or show the window
- if ( this.window.windowState == "minimized" )
- dojo.fx.html.explode( this.domNode, this.window.domNode, 460, function() { showWindow.show(); } ) ; // began as 300 in ff
- else
- this.window.show();
+ var showWindowCallback = function()
+ {
+ if (dojo.render.html.ie)
+ dojo.lang.setTimeout( function() { showWindow.show(); }, 100 );
+ else
+ showWindow.show();
+ }
+ var explodeCallback = function()
+ {
+ if ( showWindow.windowState == "minimized" )
+ dojo.fx.html.explode( btnNode, showWindowNode, 300, showWindowCallback ) ; // began as 300 in ff
+ else
+ showWindow.show();
+ }
+ var fadeCallback = function()
+ {
+ dojo.fx.html.fade( btnNode, 75, 0.5, 1, explodeCallback );
+ }
+ dojo.fx.html.fade( btnNode, 80, 1, 0.5, fadeCallback );
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org