rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/platform/wm/rhodes/simulator/MainWindowQt.h

@@ -118,6 +118,8 @@ public:
     void tabbarSwitch(int index);
     void tabbarBadge(int index, char* badge);
     int tabbarGetCurrent();
+    bool isExistJavascript(const wchar_t* szJSFunction, int index){return true;}
+
 
     BEGIN_MSG_MAP(CMainWindow)
         MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
@@ -130,6 +132,7 @@ public:
         COMMAND_ID_HANDLER(IDM_REFRESH, OnRefreshCommand)
         COMMAND_ID_HANDLER(IDM_NAVIGATE, OnNavigateCommand)
         COMMAND_ID_HANDLER(ID_SETCOOKIE, OnSetCookieCommand)
+        COMMAND_ID_HANDLER(IDM_EXECUTEJS, OnExecuteJS)
         MESSAGE_HANDLER(WM_TAKEPICTURE, OnTakePicture)
         MESSAGE_HANDLER(WM_SELECTPICTURE, OnSelectPicture)
         MESSAGE_HANDLER(WM_ALERT_SHOW_POPUP, OnAlertShowPopup)
@@ -153,6 +156,7 @@ private:
     LRESULT OnRefreshCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/);
     LRESULT OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/);
     LRESULT OnSetCookieCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnExecuteJS(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/);
 
     LRESULT OnTakePicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnSelectPicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);

data/platform/wp7/RhoRubyExtGen/RhoWebView.cs

@@ -53,7 +53,7 @@ namespace rho.rubyext
         }
 
         [RubyMethodAttribute("execute_js", RubyMethodAttributes.PublicSingleton)]
-        public static void execute_js(RubyModule/*!*/ self, [NotNull]String/*!*/ strScript, int index = 0)
+        public static void execute_js(RubyModule/*!*/ self, [NotNull]String/*!*/ strScript, int index = 0, RubyArray vals = null)
         {
         }
 

data/platform/wp7/RhoRubyLib/Initializers.Generated.cs

@@ -467,7 +467,7 @@ namespace rho.rubyext {
             
             DefineLibraryMethod(module, "execute_js", 0x21, 
                 0x00000002U, 
-                new Action<IronRuby.Builtins.RubyModule, System.String, System.Int32>(rho.rubyext.RhoWebView.execute_js)
+                new Action<IronRuby.Builtins.RubyModule, System.String, System.Int32, IronRuby.Builtins.RubyArray>(rho.rubyext.RhoWebView.execute_js)
             );
             
             DefineLibraryMethod(module, "navigate", 0x21, 

data/platform/wp7/RhoRubyLib/common/RhodesApp.cs

@@ -56,7 +56,9 @@ namespace rho.common
         private PhoneApplicationPage m_appMainPage;
         public PhoneApplicationPage MainPage { get { return m_appMainPage; } }
         private Grid m_layoutRoot;
-        private TabControl m_tabControl;
+        //private TabControl m_tabControl;
+        private Pivot m_tabControl;
+        public Pivot Tab { get { return m_tabControl; } }
         private Stack<Uri> m_backHistory = new Stack<Uri>();
         private Stack<Uri> m_forwardHistory = new Stack<Uri>();
         private Hash m_menuItems = null;
@@ -85,6 +87,11 @@ namespace rho.common
         public String getBlobsDirPath() { return m_strBlobsDirPath; }
         public String getHomeUrl() { return m_strHomeUrl; }
 
+        private void Pivot_OnChanged(object sender, RoutedEventArgs e)
+        {
+            ((RhoView)(((PivotItem)m_tabControl.SelectedItem).Content)).refresh();
+        }
+
         public void Init(WebBrowser browser, PhoneApplicationPage appMainPage, Grid layoutRoot, RhoView rhoView)
         {
             initAppUrls();
@@ -225,11 +232,11 @@ namespace rho.common
                     {
                         if (m_tabControl != null && m_tabControl.Items.Count > 0)
                         {
-                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.IsScriptEnabled = true;
+                            ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.IsScriptEnabled = true;
                             if (isExternalUrl(strUrl))
-                                ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Absolute));
+                                ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Absolute));
                             else
-                                ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Relative));
+                                ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Relative));
                         }
                     }
                     else
@@ -258,7 +265,7 @@ namespace rho.common
                     {
                         if (m_tabControl != null && m_tabControl.Items.Count > 0)
                         {
-                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(m_webBrowser.Source);
+                            ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(m_webBrowser.Source);
                         }
                     }
                     else
@@ -273,37 +280,21 @@ namespace rho.common
             });
         }
 
-        public void processInvokeScript(String strScript, int index)
-        {
-            String[] arr = strScript.Split('(');
-            String[] arrParams = null;
-            if (arr.Length > 1)
-            {
-                arrParams = arr[1].Split(',');
-                if (arrParams.Length == 1)
-                {
-                    arrParams[0] = arrParams[0].Replace('"', ' ');
-                    arrParams[0] = arrParams[0].Replace(')', ' ');
-                    arrParams[0] = arrParams[0].Replace(';', ' ');
-                    arrParams[0] = arrParams[0].Trim();
-                }
-            }
-
-            processInvokeScriptArgs(arr[0], arrParams, index);
-        }
 
         public void processInvokeScriptArgs(String strFuncName, String[] arrParams, int index)
         {
+            if (null != strFuncName && 0 < strFuncName.Length && (null == arrParams || 0 == arrParams.Length))
+            {
+                arrParams = new String[]{strFuncName};
+                strFuncName = CHttpServer.JS_EVAL_FUNCNAME;
+            }
             m_webBrowser.Dispatcher.BeginInvoke(() =>
             {
                 try
                 {
-                    if (index > 0)
+                    if (index >= 0 && m_tabControl != null && m_tabControl.Items.Count > 0)
                     {
-                        if (m_tabControl != null && m_tabControl.Items.Count > 0)
-                        {
-                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.InvokeScript(strFuncName, arrParams);
-                        }
+                        ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.InvokeScript(strFuncName, arrParams);
                     }
                     else
                     {
@@ -694,16 +685,17 @@ namespace rho.common
                        // continue;
 
 
-                    //tabItem.Header = "Test";to do
-                    TabItem tabItem = new TabItem();
-                    tabItem.Header = new RhoTabHeader(label, icon);
+                    //PivotItem.Header = "Test";to do
+                    //PivotItem PivotItem = new PivotItem();
+                    PivotItem PivotItem = new PivotItem();
+                    PivotItem.Header = new RhoTabHeader(label, icon);
                     //if (i == 0)// && use_current_view_for_tab)
-                    tabItem.Content = new RhoView(m_appMainPage, m_layoutRoot, action, reload, web_bkg_color);
+                    PivotItem.Content = new RhoView(m_appMainPage, m_layoutRoot, action, reload, web_bkg_color, i);
                     if (values.TryGetValue(CRhoRuby.CreateSymbol("selected_color"), out val))
-                        tabItem.Background = new SolidColorBrush(getColorFromString(val.ToString()));
+                        PivotItem.Background = new SolidColorBrush(getColorFromString(val.ToString()));
                     if (values.TryGetValue(CRhoRuby.CreateSymbol("disabled"), out val))
-                        tabItem.IsEnabled = !Convert.ToBoolean(val);
-                    m_tabControl.Items.Add(tabItem);
+                        PivotItem.IsEnabled = !Convert.ToBoolean(val);
+                    m_tabControl.Items.Add(PivotItem);
                 }
             }
         }
@@ -712,11 +704,14 @@ namespace rho.common
         {
             m_appMainPage.Dispatcher.BeginInvoke( () =>
             {
-                m_tabControl = new TabControl();
+                /*m_tabControl = new TabControl();
                 if (tabBarType == 1)
                     m_tabControl.TabStripPlacement = Dock.Top;
                 else if (tabBarType == 3)
-                    m_tabControl.TabStripPlacement = Dock.Left;
+                    m_tabControl.TabStripPlacement = Dock.Left;*/
+
+                m_tabControl = new Pivot();
+                m_tabControl.SelectionChanged += Pivot_OnChanged;
 
                 Object[] hashArray = null;
                 Hash paramHash = null;
@@ -770,7 +765,7 @@ namespace rho.common
                 if (m_tabControl != null)
                 {
                     //TO DO
-                    //((TabItem)m_tabControl.Items[index]).Header
+                    //((PivotItem)m_tabControl.Items[index]).Header
                 }
             });
         }

data/platform/wp7/RhoRubyLib/net/HttpServer.cs

@@ -28,6 +28,8 @@ using System;
 using rho.common;
 using rho;
 using System.Collections.Generic;
+using System.Collections;
+using System.Text;
 
 namespace rho.net
 {
@@ -41,6 +43,17 @@ namespace rho.net
         static CRhodesApp RHODESAPP() { return CRhodesApp.Instance; }
         private CRhoRuby RhoRuby { get { return CRhoRuby.Instance; } }
 
+        static public String HTTP_REDIRECT_CODE = "302";
+        static public String PARAM_PREFIX_REQ = "request-";
+        static public String PARAM_PREFIX_RESP = "response-";
+        static public String RESPONSE_BODY_FILEPATH = "response-body-filepath";
+        static public String JS_EVAL_FUNCNAME = "_rho_execJsWrapper";
+        static public String AJAX_CALLBACK_FUNCNAME = "_rho_ajaxProxyCallback";
+        static public String AJAX_PARAM_CALLBACK_ID = "_rho_callbackId";
+        static public String AJAX_PARAM_RESPONSE = "response";
+        static public String AJAX_PARAM_STATUS = "status";
+        static public String AJAX_PARAM_MESSAGE = "message";
+
         class CRoute
         {
             public String application = "";
@@ -64,6 +77,7 @@ namespace rho.net
         class CServerCommand : IQueueCommand
         {
             String m_method, m_uri, m_query, m_body;
+            Dictionary<String, String> m_headers;
             CRoute m_route;
             CHttpServer m_Parent;
             int m_nCommand;
@@ -72,27 +86,78 @@ namespace rho.net
             public const int scDispatch = 1, scIndex = 2;
 
             public CServerCommand(CHttpServer Parent, CRoute route,
-                String method, String uri, String query, String body, int nCommand, String strAjaxContext)
+                String method, String uri, IDictionary headers, IDictionary data, int nCommand, String strAjaxContext)
             {
                 m_Parent = Parent;
-                m_method = method;
-                m_uri = uri;
-                m_query = query;
-                m_body = body;
+                m_method = (null != method) ? method.toUpperCase() : "GET";
+                m_uri = (0 <= uri.indexOf('?')) ? uri.substring(0, uri.indexOf('?')) : uri;
                 m_route = route;
                 m_nCommand = nCommand;
                 m_strAjaxContext = strAjaxContext;
+
+                m_body = "";
+
+                m_headers = new Dictionary<String, String>();
+                if (null != headers)
+                {
+                    foreach (object key in headers.Keys)
+                    {
+                        m_headers[key.ToString()] = headers[key].ToString();
+                    }
+                }
+
+                // Query parameters from URL are added first, then data parameters added.
+                m_query = (0 <= uri.indexOf('?')) ? uri.substring(uri.indexOf('?') + 1) : "";
+                if (null != data)
+                {
+                    StringBuilder sb = new StringBuilder(m_query);
+                    foreach (object key in data.Keys)
+                    {
+                        if (0 < sb.Length) sb.Append("&");
+                        sb.Append(key.ToString() + "=" + (null != data[key] ? data[key].ToString() : ""));
+                    }
+                    m_query = sb.ToString();
+                }
+            }
+
+            public boolean isAjaxRequest()
+            {
+                return (m_strAjaxContext != null && 0 < m_strAjaxContext.length());
             }
 
             public void execute()
             {
                 String strUrl = "";
-                if (m_nCommand == scDispatch )
-                    strUrl = m_Parent.processDispatch(m_route, m_method, m_uri, m_query, m_body);
-                else if ( m_nCommand == scIndex )
-                    strUrl = m_Parent.processIndex(m_route, m_method, m_uri, m_query, m_body);
+                IDictionary result = null;
+                if (m_nCommand == scDispatch)
+                {
+                    result = m_Parent.processDispatch(m_route, m_method, m_uri, m_headers, m_query, m_body);
+                    strUrl = result[RESPONSE_BODY_FILEPATH].ToString();
+
+                    if (isAjaxRequest() && result[AJAX_PARAM_STATUS].ToString().equals(HTTP_REDIRECT_CODE))
+                    {
+                        IDictionary headers = new Dictionary<String, String>();
+                        headers["X-Requested-With"] = "XMLHttpRequest";
+                        if (!RHODESAPP().HttpServer.processBrowserRequest(
+                            "GET",
+                            new Uri(strUrl, UriKind.Relative),
+                            headers,
+                            new Dictionary<String, String>(),
+                            m_strAjaxContext
+                            ))
+                        {
+                            LOG.ERROR("Ajax request redirection failed.");
+                        }
+                        return;
+                    }
+                }
+                else if (m_nCommand == scIndex)
+                {
+                    result = m_Parent.processIndex(m_route, m_method, m_uri, m_headers, m_query, m_body);
+                    strUrl = result[RESPONSE_BODY_FILEPATH].ToString();
+                }
 
-                if (m_strAjaxContext == null || m_strAjaxContext.length() == 0)
+                if (!isAjaxRequest())
                 {
                     RHODESAPP().processWebNavigate(strUrl, -1);
                 }
@@ -100,13 +165,31 @@ namespace rho.net
                 {
                     String res = CRhoFile.isResourceFileExist(strUrl) ? CRhoFile.readStringFromResourceFile(strUrl) : CRhoFile.readFileToString(strUrl);
 
-                    String[] args = new String[4];
+                    
+                    IDictionary headers = new Dictionary<String, String>();
+                    StringBuilder jsonHeaders = new StringBuilder();
+                    foreach (object key in result.Keys)
+                    {
+                        if (
+                               key.ToString().startsWith(PARAM_PREFIX_REQ)
+                            || key.ToString().startsWith(PARAM_PREFIX_RESP)
+                            || key.ToString().equals(AJAX_PARAM_MESSAGE)
+                            || key.ToString().equals(AJAX_PARAM_STATUS)
+                            ) continue;
+                        headers[key.ToString()] = result[key].ToString();
+                        jsonHeaders.AppendFormat("{0}\"{1}\": \"{2}\"",
+                            (0 < jsonHeaders.Length) ? ", " : "",
+                            key.ToString(), result[key].ToString());
+                    }
+
+                    String[] args = new String[5];
                     args[0] = m_strAjaxContext;
                     args[1] = res;
-                    args[2] = "ok";
-                    args[3] = "200";
+                    args[2] = "{" + jsonHeaders + "}";
+                    args[3] = result[AJAX_PARAM_MESSAGE].ToString();
+                    args[4] = result[AJAX_PARAM_STATUS].ToString();
 
-                    RHODESAPP().processInvokeScriptArgs("_rho_ajaxProxyCallback", args, RHODESAPP().getCurrentTab());
+                    RHODESAPP().processInvokeScriptArgs(AJAX_CALLBACK_FUNCNAME, args, RHODESAPP().getCurrentTab());
                 }
             }
 
@@ -140,6 +223,11 @@ namespace rho.net
         }
 
         public boolean processBrowserRequest(Uri uri, String strAjaxContext)
+        {
+            return processBrowserRequest("get", uri, null, null, strAjaxContext);
+        }
+
+        public boolean processBrowserRequest(String reqType, Uri uri, IDictionary headers, IDictionary data, String strAjaxContext)
         {
             boolean bAjaxCall = !(strAjaxContext == null || strAjaxContext.length() == 0);
             
@@ -168,7 +256,10 @@ namespace rho.net
             CRoute route = new CRoute();
             if (dispatch(url, route))
             {
-                addQueueCommand(new CServerCommand(this, route, bAjaxCall ? "GET" : "GET", url, query, "", CServerCommand.scDispatch, strAjaxContext));
+                addQueueCommand(new CServerCommand(this, route, reqType,
+                    url + (0 < query.Length ? ("?"+query) : ""),
+                    headers, data, CServerCommand.scDispatch, strAjaxContext));
+                //addQueueCommand(new CServerCommand(this, route, bAjaxCall ? "GET" : "GET", url, query, "", CServerCommand.scDispatch, strAjaxContext));
 
                 return true;
             }
@@ -178,7 +269,8 @@ namespace rho.net
             String strIndexFile = getIndex(fullPath);
             if (strIndexFile.Length > 0)
             {
-                addQueueCommand(new CServerCommand(this, route, bAjaxCall ? "GET" : "GET", url, query, "", CServerCommand.scIndex, strAjaxContext));
+                addQueueCommand(new CServerCommand(this, route, reqType, url, headers, data, CServerCommand.scIndex, strAjaxContext));
+                //addQueueCommand(new CServerCommand(this, route, bAjaxCall ? "GET" : "GET", url, query, "", CServerCommand.scIndex, strAjaxContext));
 
                 return true;
             }
@@ -186,14 +278,17 @@ namespace rho.net
             return false;
         }
 
-        String processDispatch(CRoute route, String method, String uri, String query, String body)
+        IDictionary processDispatch(CRoute route, String method, String uri, Dictionary<String, String> headers, String query, String body)
         {
-            Object rhoReq = create_request_hash(route, method, uri, query, null, body);
+            Object rhoReq = create_request_hash(route, method, uri, query, headers, body);
             Object rhoResp = RhoRuby.callServe(rhoReq);
 
             String strRedirectUrl = getRedirectUrl(rhoResp);
             if (strRedirectUrl.Length > 0)
-                return strRedirectUrl;
+            {
+                ((IDictionary)rhoResp)[RESPONSE_BODY_FILEPATH] = strRedirectUrl;
+                return (IDictionary)rhoResp;
+            }
 
             String strFilePath = RHODESAPP().canonicalizeRhoPath(uri) + ".gen.html";
             if (route.id.Length > 0)
@@ -204,12 +299,14 @@ namespace rho.net
 
             if (method == "GET")
                 RHODESAPP().keepLastVisitedUrl(uri);
-
-            return strFilePath;
+            ((IDictionary)rhoResp)[RESPONSE_BODY_FILEPATH] = strFilePath;
+            return (IDictionary)rhoResp;
         }
 
-        String processIndex(CRoute route, String method, String uri, String query, String body)
+        IDictionary processIndex(CRoute route, String method, String uri, Dictionary<String, String> headers, String query, String body)
         {
+            Object rhoResp = new Dictionary<String, String>();
+
             String fullPath = uri.StartsWith(m_root) ? uri : CFilePath.join(m_root, uri);
             String strIndexFile = getIndex(fullPath);
 
@@ -219,18 +316,25 @@ namespace rho.net
                 String strFilePath = CFilePath.join(m_root, "rhodes_error") + ".gen.html";
                 CRhoFile.recursiveCreateDir(strFilePath);
                 CRhoFile.writeStringToFile(strFilePath, error);
-                return strFilePath;
+                ((IDictionary)rhoResp)[RESPONSE_BODY_FILEPATH] = strFilePath;
+                return (IDictionary)rhoResp;
             }
 
             if (CFilePath.getExtension(fullPath).Length > 0)
-                return strIndexFile;
+            {
+                ((IDictionary)rhoResp)[RESPONSE_BODY_FILEPATH] = strIndexFile;
+                return (IDictionary)rhoResp;
+            }
 
-            Object rhoReq = create_request_hash(route, method, uri, query, null, body);
-            Object rhoResp = RhoRuby.callServeIndex(strIndexFile, rhoReq);
+            Object rhoReq = create_request_hash(route, method, uri, query, headers, body);
+            rhoResp = RhoRuby.callServeIndex(strIndexFile, rhoReq);
 
             String strRedirectUrl = getRedirectUrl(rhoResp);
             if (strRedirectUrl.Length > 0)
-                return strRedirectUrl;
+            {
+                ((IDictionary)rhoResp)[RESPONSE_BODY_FILEPATH] = strRedirectUrl;
+                return (IDictionary)rhoResp;
+            }
 
             strIndexFile += ".gen.html";
             CRhoFile.recursiveCreateDir(strIndexFile);
@@ -239,7 +343,8 @@ namespace rho.net
             if (method == "GET")
                 RHODESAPP().keepLastVisitedUrl(uri);
 
-            return strIndexFile;
+            ((IDictionary)rhoResp)[RESPONSE_BODY_FILEPATH] = strIndexFile;
+            return (IDictionary)rhoResp;
         }
 /*
         CResponse decide(String method, String uri, String query, String body)
@@ -493,7 +598,7 @@ namespace rho.net
             }
             RhoRuby.hashAdd(hash, "headers", hash_headers);
 	
-            if ( body.Length > 0 )
+            if ( null != body && body.Length > 0 )
                 RhoRuby.hashAdd(hash, "request-body", body);
     
             return hash;