Attachment 211027 Details for Bug 358571 – Closing with

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Closing with

clipboard.txt (text/plain), 3.79 KB, created by Malgorzata Janczarska

on 2012-02-15 04:35:44 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Malgorzata Janczarska

Created: 2012-02-15 04:35:44 EST

Size: 3.79 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/LoginDialog.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/LoginDialog.js
>index b413b0b..8b2a62f 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/LoginDialog.js
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/LoginDialog.js
>@@ -26,6 +26,19 @@
> 		
> 		postCreate : function() {
> 			this.inherited(arguments);
>+			var _self = this;
>+
>+			dojo.addClass(this.closeLink, "imageSprite");
>+			dojo.addClass(this.closeLink, "core-sprite-close");
>+			
>+			dojo.connect(this.closeLink, "onmouseover", this.closeLink, function() {
>+				_self.closeLink.style.cursor = "pointer";
>+			});
>+			dojo.connect(this.closeLink, "onmouseout", this.closeLink, function() {
>+				_self.closeLink.style.cursor = "default";
>+			});
>+			
>+			dojo.connect(this.closeLink, "onclick", function() {dojo.hitch(_self, _self.closeDialog)();});
> 		},
> 	
> 		setPendingAuthentication: function(services){
>@@ -138,9 +151,7 @@
> 					return function(){authService.logout().then(dojo.hitch(_self, function(){
> 						this.addUserItem(i, authService, this.authenticatedServices[i].label);
> 						if(this.isSingleService()){
>-							if(dijit.popup.hide)
>-								dijit.popup.hide(this); //close doesn't work on FF
>-							dijit.popup.close(this);
>+							this.closeDialog();
> 						}
> 						localStorage.removeItem(i);
> 						}));};
>@@ -275,8 +286,7 @@
> 	    img.src = null; // no server request
> 		return url.match(re)[1].toString();
> 		},
>-	_onBlur: function(){
>-		this.inherited(arguments);
>+	closeDialog: function(){
> 		if(dijit.popup.hide)
> 			dijit.popup.hide(this); //close doesn't work on FF
> 		dijit.popup.close(this);
>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/LoginDialog.html b/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/LoginDialog.html
>index 16add52..25733e9 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/LoginDialog.html
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/LoginDialog.html
>@@ -1,16 +1,26 @@
> 
> <div>
>-	<div class="dijitTooltipContainer" role="presentation" style="width: 300px; padding-left: 0; padding-right: 0; padding-top: 0.5em; padding-bottom: 0.45em">
>+	<div class="dijitTooltipContainer" role="presentation" style="width: 300px; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0.45em">
> 		<div class="dijitTooltipContents dijitTooltipFocusNode" role="dialog"
> 			dojoattachpoint="containerNode" style="padding: 0">
>-			<h2 dojoAttachPoint="emptyListInfo" class="LoginWindowLeft">No authentication required.</h2>
>-			<table dojoAttachPoint="authenticated" style="display: none; width: 100%;">
>-			 <tbody dojoAttachPoint="authenticatedList">
>-			</tbody>
>-			
>-			<table dojoAttachPoint="otherUnauthenticated" style="display: none; width: 100%;">
>-			 <tbody dojoAttachPoint="otherUnauthenticatedList">
>-			</tbody>
>+			<table style="width: 100%;">
>+				<tr>
>+					<td style="text-align: left; vertical-align: top;">
>+						<h2 dojoAttachPoint="emptyListInfo" class="LoginWindowLeft">No authentication required.</h2>
>+						<table dojoAttachPoint="authenticated" style="display: none; width: 100%;">
>+							<tbody dojoAttachPoint="authenticatedList">
>+							</tbody>
>+						</table>
>+						<table dojoAttachPoint="otherUnauthenticated" style="display: none; width: 100%;">
>+							<tbody dojoAttachPoint="otherUnauthenticatedList">
>+							</tbody>
>+						</table>
>+					</td>
>+					<td style="text-align: right; vertical-align: top; padding-right: 2px; margin: 0">
>+						<span dojoAttachPoint="closeLink" role="button" title="Close"></span>
>+					</td>
>+				</tr>
>+			</table>
> 		</div>
> 	</div>
> 	<div class="dijitTooltipConnector" role="presentation"></div>

Actions: View | Diff

Attachments on bug 358571: 210981 | 210987 | 210988 | 210989 | 211027