projects / potlatch2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 348d89a)
making oAuth open up in a smaller centred window
authorAntony Pegg <antthelimey@gmail.com>
Mon, 18 Apr 2011 15:29:49 +0000 (11:29 -0400)
committerAntony Pegg <antthelimey@gmail.com>
Mon, 18 Apr 2011 15:29:49 +0000 (11:29 -0400)
.gitignore patch | blob | history
net/systemeD/potlatch2/save/OAuthPanel.mxml patch | blob | history
resources/ok_go.html [new file with mode: 0644] patch | blob

diff --git a/.gitignore b/.gitignore
index f3b6c16..b07f606 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,18 @@ build.properties
 l10n/locale/bundles
 version.as
 halcyon.tmproj
+Potlatch2.as3proj
 
 resources/locales
 resources/*.swf
 resources/*.cache
 resources/docs
+resources/mapquest
 
 /tests/bin/
 /tests/report/
 
 /generated
+
+bin/
+obj/
diff --git a/net/systemeD/potlatch2/save/OAuthPanel.mxml b/net/systemeD/potlatch2/save/OAuthPanel.mxml
index 096222e..090b084 100644 (file)
--- a/net/systemeD/potlatch2/save/OAuthPanel.mxml
+++ b/net/systemeD/potlatch2/save/OAuthPanel.mxml
@@ -67,11 +67,14 @@
        </mx:ControlBar>
        
        <mx:Script><![CDATA[
+               import flash.display.InteractiveObject;
         import flash.events.Event;
         import flash.net.*;
+               import flash.system.Capabilities;
         import mx.managers.PopUpManager;
         import net.systemeD.halcyon.connection.*;
         import org.iotashan.oauth.*;
+               import flash.external.ExternalInterface;
 
         private var connection:Connection;
         private var requestToken:OAuthToken;
@@ -87,9 +90,19 @@
         }
         
         private function openURL(url:String):void {
-            var urlRequest:URLRequest = new URLRequest(url);
-            navigateToURL(urlRequest, "_blank");
-        }
+                       if (ExternalInterface.available) {
+                               var winH:int = 560;
+                               var winW:int = 600;
+                               var leftPos:int  = (Capabilities.screenResolutionX - winW) / 2;
+                               var topPos:int = (Capabilities.screenResolutionY - winH) / 2;
+                               ExternalInterface.call( "window.open", url,"oAuthWin","height=" + winH + ",width=" + winW +",top=" + topPos + ", left=" + leftPos +", toolbar=no,scrollbars=no,status=no,location=no,menubar=no,directories=no");
+                               }               
+                       else
+                       {
+                               var urlRequest:URLRequest = new URLRequest(url);
+                               navigateToURL(urlRequest,"_blank");
+                       }
+               }
         
         private function getRequestToken():void {
             connection = Connection.getConnectionInstance();
@@ -134,8 +147,8 @@
             
             var url:String = Connection.getParam("oauth_auth_url", "http://127.0.0.1:3000/oauth/authorize");            
             link.label = url;
-            authoriseURL = url + "?oauth_token="+requestToken.key;
-            progress.visible = false;
+                       authoriseURL = url + "?oauth_token="+requestToken.key;
+                       progress.visible = false;
             gotLinkBox.visible = true;
         }
 
diff --git a/resources/ok_go.html b/resources/ok_go.html
new file mode 100644 (file)
index 0000000..9599d33
--- /dev/null
+++ b/resources/ok_go.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+       <script language="javascript">
+        function sendBack() {
+               if (window.self.opener) {
+                        window.self.opener.focus();
+               }
+               window.self.close();
+        }
+       </script>
+</head>
+<body onload="sendBack()">
+SUCCESS!
+<br />
+<br />
+go <a href="http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager07.html" target="_new">here</A> to clear cache and see this window again
+
+</body>
+</html>
\ No newline at end of file
Potlatch 2