rhodes 3.3.3.beta.3 → 3.3.3.beta.4

data/platform/wp7/RhoRubyExtGen/RhoDateTimePicker.cs

@@ -0,0 +1,60 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+using Microsoft.Scripting.Utils;
+using Microsoft.Scripting.Runtime;
+using IronRuby.Runtime;
+using IronRuby.Builtins;
+using System;
+using System.Runtime.InteropServices;
+
+namespace rho.rubyext
+{
+    [RubyModule("DateTimePicker")]
+    public static class RhoDateTimePicker
+    {
+
+        #region Private Implementation Details
+
+        #endregion
+
+        #region Private Instance & Singleton Methods
+
+
+        [RubyMethodAttribute("choose", RubyMethodAttributes.PublicSingleton)]
+        public static void choose(RubyModule/*!*/ self, params object[] args)
+        {
+        }
+
+        [RubyMethodAttribute("choose_with_range", RubyMethodAttributes.PublicSingleton)]
+        public static void choose_with_range(RubyModule/*!*/ self, params object[] args)
+        {
+        }
+
+        #endregion
+
+    }
+}

data/platform/wp7/RhoRubyExtGen/RhoRubyExtGen.csproj

@@ -57,6 +57,7 @@
     <Compile Include="RhoAsyncHttp.cs" />
     <Compile Include="RhoCamera.cs" />
     <Compile Include="RhoConfig.cs" />
+    <Compile Include="RhoDateTimePicker.cs" />
     <Compile Include="RhoJSON.cs" />
     <Compile Include="RhoNativeBar.cs" />
     <Compile Include="RhoSyncEngine.cs" />

data/platform/wp7/RhoRubyExtGen/RhoWebView.cs

@@ -43,22 +43,22 @@ namespace rho.rubyext
         #region Private Instance & Singleton Methods
 
         [RubyMethodAttribute("navigate", RubyMethodAttributes.PublicSingleton)]
-        public static void Navigate(RubyModule/*!*/ self, [NotNull]String/*!*/ url, int index = 0)
+        public static void Navigate(RubyModule/*!*/ self, [NotNull]String/*!*/ url, int index = -1)
         {
         }
 
         [RubyMethodAttribute("refresh", RubyMethodAttributes.PublicSingleton)]
-        public static void Refresh(RubyModule/*!*/ self, int index = 0)
+        public static void Refresh(RubyModule/*!*/ self, int index = -1)
         {
         }
 
         [RubyMethodAttribute("execute_js", RubyMethodAttributes.PublicSingleton)]
-        public static void execute_js(RubyModule/*!*/ self, [NotNull]String/*!*/ strScript, int index = 0, RubyArray vals = null)
+        public static void execute_js(RubyModule/*!*/ self, [NotNull]String/*!*/ strScript, int index = -1, RubyArray vals = null)
         {
         }
 
         [RubyMethodAttribute("current_location", RubyMethodAttributes.PublicSingleton)]
-        public static String currentLocation(RubyModule/*!*/ self)
+        public static String currentLocation(RubyModule/*!*/ self, int index = -1)
         {
             return null;
         }

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

@@ -28,6 +28,7 @@ namespace rho.rubyext {
             
             DefineGlobalModule("Alert", typeof(rho.rubyext.RhoAlert), 0x00000008, null, LoadAlert_Class, null, IronRuby.Builtins.RubyModule.EmptyArray);
             DefineGlobalModule("Camera", typeof(rho.rubyext.RhoCamera), 0x00000008, null, LoadCamera_Class, null, IronRuby.Builtins.RubyModule.EmptyArray);
+            DefineGlobalModule("DateTimePicker", typeof(rho.rubyext.RhoDateTimePicker), 0x00000008, null, LoadDateTimePicker_Class, null, IronRuby.Builtins.RubyModule.EmptyArray);
             DefineGlobalModule("NativeBar", typeof(rho.rubyext.RhoNativeBar), 0x00000008, null, LoadNativeBar_Class, null, IronRuby.Builtins.RubyModule.EmptyArray);
             IronRuby.Builtins.RubyModule def3 = DefineGlobalModule("Rho", typeof(rho.rubyext.RhoRoot), 0x00000008, null, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             IronRuby.Builtins.RubyModule def1 = DefineGlobalModule("Rho", typeof(rho.rubyext.Rho), 0x00000008, null, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
@@ -87,6 +88,19 @@ namespace rho.rubyext {
             
         }
         
+        private static void LoadDateTimePicker_Class(IronRuby.Builtins.RubyModule/*!*/ module) {
+            DefineLibraryMethod(module, "choose", 0x21, 
+                0x80000000U, 
+                new Action<IronRuby.Builtins.RubyModule, System.Object[]>(rho.rubyext.RhoDateTimePicker.choose)
+            );
+            
+            DefineLibraryMethod(module, "choose_with_range", 0x21, 
+                0x80000000U, 
+                new Action<IronRuby.Builtins.RubyModule, System.Object[]>(rho.rubyext.RhoDateTimePicker.choose_with_range)
+            );
+            
+        }
+        
         private static void LoadNativeBar_Class(IronRuby.Builtins.RubyModule/*!*/ module) {
             DefineLibraryMethod(module, "create", 0x21, 
                 0x00000000U, 
@@ -462,7 +476,7 @@ namespace rho.rubyext {
         private static void LoadWebView_Class(IronRuby.Builtins.RubyModule/*!*/ module) {
             DefineLibraryMethod(module, "current_location", 0x21, 
                 0x00000000U, 
-                new Func<IronRuby.Builtins.RubyModule, System.String>(rho.rubyext.RhoWebView.currentLocation)
+                new Func<IronRuby.Builtins.RubyModule, System.Int32, System.String>(rho.rubyext.RhoWebView.currentLocation)
             );
             
             DefineLibraryMethod(module, "execute_js", 0x21, 

data/platform/wp7/RhoRubyLib/RhoRubyLib.csproj

@@ -46,7 +46,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Coding4Fun.Phone.Controls">
-    <HintPath>..\..\..\res\build-tools\Coding4Fun.Phone.Controls.dll</HintPath>
+      <HintPath>..\..\..\res\build-tools\Coding4Fun.Phone.Controls.dll</HintPath>
     </Reference>
     <Reference Include="IronRuby">
       <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.dll</HintPath>
@@ -56,6 +56,9 @@
     </Reference>
     <Reference Include="Microsoft.Phone" />
     <Reference Include="Microsoft.Phone.Controls, Version=7.0.0.0, Culture=neutral, PublicKeyToken=24eec0d8c86cda1e, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.Phone.Controls.Toolkit">
+      <HintPath>..\..\..\res\build-tools\Microsoft.Phone.Controls.Toolkit.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Phone.Interop" />
     <Reference Include="Microsoft.Scripting">
       <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.dll</HintPath>
@@ -127,6 +130,7 @@
     <Compile Include="rubyext\RhoConfig.cs" />
     <Compile Include="rubyext\RhoDatabase.cs" />
     <Compile Include="RhoRuby.cs" />
+    <Compile Include="rubyext\RhoDateTimePicker.cs" />
     <Compile Include="rubyext\RhoJSON.cs" />
     <Compile Include="rubyext\RhoKernelOps.cs" />
     <Compile Include="rubyext\RhoNativeBar.cs" />
@@ -148,6 +152,9 @@
     <Compile Include="sync\SyncThread.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="views\RhoDateTimeDlg.xaml.cs">
+      <DependentUpon>RhoDateTimeDlg.xaml</DependentUpon>
+    </Compile>
     <Compile Include="views\RhoTabHeader.xaml.cs">
       <DependentUpon>RhoTabHeader.xaml</DependentUpon>
     </Compile>
@@ -163,6 +170,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Page Include="views\RhoDateTimeDlg.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="views\RhoTabHeader.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -172,7 +183,6 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions />

data/platform/wp7/RhoRubyLib/WP_PlatformAdaptationLayer.cs

@@ -38,6 +38,7 @@ namespace rho
     {
         public override bool FileExists(string path)
         {
+            if (path == "") return false;
             return CRhoFile.isResourceFileExist(path) || CRhoFile.isFileExist(path);
         }
 
@@ -58,6 +59,7 @@ namespace rho
 
         public override bool DirectoryExists(string path)
         {
+            if (path == "") return false;
             return CRhoFile.isDirectoryExist(path);
         }
 

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

@@ -68,10 +68,10 @@ namespace rho.common
                 szFilePath = CFilePath.removeFirstSlash(szFilePath);
                 if (eMode == EOpenModes.OpenForAppend || eMode == EOpenModes.OpenForReadWrite)
                 {
-                    if (!isFileExist(szFilePath))
-                    {
+                    //if (!isFileExist(szFilePath))
+                    //{
                         m_st = isoStore.OpenFile(szFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.Read);
-                    }
+                    //}
 
                     if (eMode == EOpenModes.OpenForAppend)
                         movePosToEnd();

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

@@ -83,8 +83,8 @@ namespace rho.common
 
         public static String removeLastSlash(String path)
         {
-            if (path.EndsWith("/") || path.EndsWith("\\") )
-                return path.Substring(1);
+            if (path.EndsWith("/") || path.EndsWith("\\"))
+                return path.Substring(1, path.length() - 2);
 
             return path;
         }

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

@@ -72,6 +72,7 @@ namespace rho.common
         private String m_strAppBackUrl;
         private RhoView m_rhoView;
         private RhoView m_masterView = null;
+        public  bool m_transition = false;
         ManualResetEvent m_UIWaitEvent = new ManualResetEvent(false);
         Vector<Object> m_arCallbackObjects = new Vector<Object>();
 
@@ -89,6 +90,7 @@ namespace rho.common
 
         private void Pivot_OnChanged(object sender, RoutedEventArgs e)
         {
+            m_currentTabIndex = m_tabControl.SelectedIndex;
             ((RhoView)(((PivotItem)m_tabControl.SelectedItem).Content)).refresh();
         }
 
@@ -97,7 +99,6 @@ namespace rho.common
             initAppUrls();
             RhoLogger.InitRhoLog();
             LOG.INFO("Init");
-
             CRhoFile.recursiveCreateDir(CFilePath.join(getBlobsDirPath()," "));
 
             m_webBrowser = browser;
@@ -228,16 +229,16 @@ namespace rho.common
             m_webBrowser.Dispatcher.BeginInvoke( () =>
             {
                 try{
-                    if (index > 0)
+                    if (m_tabControl != null && m_tabControl.Items.Count > 0)
                     {
-                        if (m_tabControl != null && m_tabControl.Items.Count > 0)
-                        {
-                            ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.IsScriptEnabled = true;
-                            if (isExternalUrl(strUrl))
-                                ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Absolute));
-                            else
-                                ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Relative));
-                        }
+                        if (index == -1)
+                            index = getCurrentTab();
+
+                        ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.IsScriptEnabled = true;
+                        if (isExternalUrl(strUrl))
+                            ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Absolute));
+                        else
+                            ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Relative));
                     }
                     else
                     {
@@ -261,12 +262,12 @@ namespace rho.common
             {
                 try
                 {
-                    if (index > 0)
+                    if (m_tabControl != null && m_tabControl.Items.Count > 0)
                     {
-                        if (m_tabControl != null && m_tabControl.Items.Count > 0)
-                        {
-                            ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(m_webBrowser.Source);
-                        }
+                        if (index == -1)
+                            index = this.getCurrentTab();
+
+                        ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(m_webBrowser.Source);
                     }
                     else
                     {
@@ -280,6 +281,17 @@ namespace rho.common
             });
         }
 
+        public int getTabIndexFor(object obj)
+        {
+            if (!(obj is WebBrowser) || m_tabControl == null || m_tabControl.Items.Count == 0) return -1;
+
+            for (int i = 0; i < m_tabControl.Items.Count; i++)
+            {
+                if (obj == ((RhoView)((PivotItem)m_tabControl.Items[i]).Content).webBrowser1) return i;
+            }
+
+            return -1;
+        }
 
         public void processInvokeScriptArgs(String strFuncName, String[] arrParams, int index)
         {
@@ -292,8 +304,11 @@ namespace rho.common
             {
                 try
                 {
-                    if (index >= 0 && m_tabControl != null && m_tabControl.Items.Count > 0)
+                    if (m_tabControl != null && m_tabControl.Items.Count > 0)
                     {
+                        if (index == -1)
+                            index = getCurrentTab();
+
                         ((RhoView)((PivotItem)m_tabControl.Items[index]).Content).webBrowser1.InvokeScript(strFuncName, arrParams);
                     }
                     else
@@ -323,7 +338,10 @@ namespace rho.common
 
         public String getCurrentUrl(int index)
         {
-            return m_currentUrls[m_currentTabIndex];
+            if ( index == -1 )
+                index = m_currentTabIndex;
+
+            return m_currentUrls[index];
         }
 
         public void keepLastVisitedUrl(String strUrl)
@@ -709,7 +727,7 @@ namespace rho.common
                     m_tabControl.TabStripPlacement = Dock.Top;
                 else if (tabBarType == 3)
                     m_tabControl.TabStripPlacement = Dock.Left;*/
-
+                
                 m_tabControl = new Pivot();
                 m_tabControl.SelectionChanged += Pivot_OnChanged;
 
@@ -731,6 +749,7 @@ namespace rho.common
                 createTabBarButtons(tabBarType, hashArray);
                 m_tabControl.Margin = new Thickness(0, 70, 0, 0);
                 m_layoutRoot.Children.Add(m_tabControl);
+                m_layoutRoot.Children.Remove(m_masterView);
             });
         }
 
@@ -742,6 +761,7 @@ namespace rho.common
                 {
                     m_tabControl.Items.Clear();
                     m_layoutRoot.Children.Remove(m_tabControl);
+                    m_layoutRoot.Children.Add(m_masterView);
                     m_masterView.refresh();
                 }
             });
@@ -772,12 +792,7 @@ namespace rho.common
 
         public int getCurrentTab()
         {
-            if (m_tabControl != null)
-            {
-                return m_tabControl.SelectedIndex;
-            }
-                
-            return -1;
+            return m_currentTabIndex;
         }
     }
 }

data/platform/wp7/RhoRubyLib/json/RJSONTokener.cs

@@ -285,7 +285,14 @@ namespace fastJSON
 			success = true;
 			
 			index = lastIndex + 1;
-			return RhoRuby.createString(number);
+            long intResult;
+            double floatResult;
+            if (long.TryParse(number, out intResult))
+                return intResult;
+            else if (double.TryParse(number, out floatResult))
+                return floatResult;
+
+            return 0;
 		}
 
 		protected static int GetLastIndexOfNumber(char[] json, int index)

data/platform/wp7/RhoRubyLib/logging/RhoLogServerSink.cs

@@ -40,12 +40,12 @@ namespace rho.logging
         private static RhoLogConf m_oLogConf;
         RhoConf RHOCONF() { return RhoConf.getInstance(); }
         CAsyncHttp m_aHttp = new CAsyncHttp(true);
-        String m_addrHost = "";
+        String m_URL = "";
 
         public RhoLogServerSink(RhoLogConf conf)
         {
             m_oLogConf = conf;
-            m_addrHost = "http://"+RHOCONF().getString("rhologhost") + ":" + RHOCONF().getString("rhologport");
+            m_URL = RHOCONF().getString("rhologurl");
         }
 
         public void close()
@@ -68,7 +68,7 @@ namespace rho.logging
         {
             IDictionary<object, object> map = new Dictionary<object, object>();
             Hash values = new Hash(map);
-            values.Add(CRhoRuby.CreateSymbol("url"), MutableString.Create(m_addrHost));
+            values.Add(CRhoRuby.CreateSymbol("url"), MutableString.Create(m_URL));
             values.Add(CRhoRuby.CreateSymbol("body"), MutableString.Create(strMsg));
             RhoParams p = new RhoParams(values);
             m_aHttp.addHttpCommand(new CAsyncHttp.HttpCommand("POST", p));

data/platform/wp7/RhoRubyLib/logging/RhoLogger.cs

@@ -363,7 +363,7 @@ namespace rho.common
     	    RhoConf.getInstance().loadConf();
     	    m_oLogConf.loadFromConf(RhoConf.getInstance());
 
-            if (RhoConf.getInstance().getString("rhologhost").length() > 0)
+            if (RhoConf.getInstance().getString("rhologurl").length() > 0)
                 m_oLogConf.setServerSynk(new rho.logging.RhoLogServerSink(m_oLogConf));
         }
     }

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

@@ -51,8 +51,8 @@ namespace rho.net
         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";
+        static public String RESPONSE_STATUS = "status";
+        static public String RESPONSE_STATUS_MESSAGE = "message";
 
         class CRoute
         {
@@ -81,12 +81,13 @@ namespace rho.net
             CRoute m_route;
             CHttpServer m_Parent;
             int m_nCommand;
+            int m_iTabIndex;
             String m_strAjaxContext;
 
             public const int scDispatch = 1, scIndex = 2;
 
             public CServerCommand(CHttpServer Parent, CRoute route,
-                String method, String uri, IDictionary headers, IDictionary data, int nCommand, String strAjaxContext)
+                String method, String uri, IDictionary headers, IDictionary data, int nCommand, String strAjaxContext, int tabIndex)
             {
                 m_Parent = Parent;
                 m_method = (null != method) ? method.toUpperCase() : "GET";
@@ -94,6 +95,7 @@ namespace rho.net
                 m_route = route;
                 m_nCommand = nCommand;
                 m_strAjaxContext = strAjaxContext;
+                m_iTabIndex = tabIndex;
 
                 m_body = "";
 
@@ -134,7 +136,7 @@ namespace rho.net
                     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))
+                    if (isAjaxRequest() && result[RESPONSE_STATUS].ToString().equals(HTTP_REDIRECT_CODE))
                     {
                         IDictionary headers = new Dictionary<String, String>();
                         headers["X-Requested-With"] = "XMLHttpRequest";
@@ -143,7 +145,8 @@ namespace rho.net
                             new Uri(strUrl, UriKind.Relative),
                             headers,
                             new Dictionary<String, String>(),
-                            m_strAjaxContext
+                            m_strAjaxContext,
+                            m_iTabIndex
                             ))
                         {
                             LOG.ERROR("Ajax request redirection failed.");
@@ -173,8 +176,8 @@ namespace rho.net
                         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)
+                            || key.ToString().equals(RESPONSE_STATUS_MESSAGE)
+                            || key.ToString().equals(RESPONSE_STATUS)
                             ) continue;
                         headers[key.ToString()] = result[key].ToString();
                         jsonHeaders.AppendFormat("{0}\"{1}\": \"{2}\"",
@@ -186,10 +189,10 @@ namespace rho.net
                     args[0] = m_strAjaxContext;
                     args[1] = res;
                     args[2] = "{" + jsonHeaders + "}";
-                    args[3] = result[AJAX_PARAM_MESSAGE].ToString();
-                    args[4] = result[AJAX_PARAM_STATUS].ToString();
+                    args[3] = result[RESPONSE_STATUS_MESSAGE] != null ? result[RESPONSE_STATUS_MESSAGE].ToString() : "";
+                    args[4] = result[RESPONSE_STATUS] != null ? result[RESPONSE_STATUS].ToString() : "";
 
-                    RHODESAPP().processInvokeScriptArgs(AJAX_CALLBACK_FUNCNAME, args, RHODESAPP().getCurrentTab());
+                    RHODESAPP().processInvokeScriptArgs(AJAX_CALLBACK_FUNCNAME, args, m_iTabIndex);
                 }
             }
 
@@ -222,12 +225,12 @@ namespace rho.net
             (pCmd as CServerCommand).execute();
         }
 
-        public boolean processBrowserRequest(Uri uri, String strAjaxContext)
+        public boolean processBrowserRequest(Uri uri, String strAjaxContext, int tabIndex = -1)
         {
-            return processBrowserRequest("get", uri, null, null, strAjaxContext);
+            return processBrowserRequest("get", uri, null, null, strAjaxContext, tabIndex);
         }
 
-        public boolean processBrowserRequest(String reqType, Uri uri, IDictionary headers, IDictionary data, String strAjaxContext)
+        public boolean processBrowserRequest(String reqType, Uri uri, IDictionary headers, IDictionary data, String strAjaxContext, int tabIndex = -1)
         {
             boolean bAjaxCall = !(strAjaxContext == null || strAjaxContext.length() == 0);
             
@@ -258,7 +261,7 @@ namespace rho.net
             {
                 addQueueCommand(new CServerCommand(this, route, reqType,
                     url + (0 < query.Length ? ("?"+query) : ""),
-                    headers, data, CServerCommand.scDispatch, strAjaxContext));
+                    headers, data, CServerCommand.scDispatch, strAjaxContext, tabIndex));
                 //addQueueCommand(new CServerCommand(this, route, bAjaxCall ? "GET" : "GET", url, query, "", CServerCommand.scDispatch, strAjaxContext));
 
                 return true;
@@ -269,7 +272,7 @@ namespace rho.net
             String strIndexFile = getIndex(fullPath);
             if (strIndexFile.Length > 0)
             {
-                addQueueCommand(new CServerCommand(this, route, reqType, url, headers, data, CServerCommand.scIndex, strAjaxContext));
+                addQueueCommand(new CServerCommand(this, route, reqType, url, headers, data, CServerCommand.scIndex, strAjaxContext, tabIndex));
                 //addQueueCommand(new CServerCommand(this, route, bAjaxCall ? "GET" : "GET", url, query, "", CServerCommand.scIndex, strAjaxContext));
 
                 return true;
@@ -317,12 +320,16 @@ namespace rho.net
                 CRhoFile.recursiveCreateDir(strFilePath);
                 CRhoFile.writeStringToFile(strFilePath, error);
                 ((IDictionary)rhoResp)[RESPONSE_BODY_FILEPATH] = strFilePath;
+                ((IDictionary)rhoResp)[RESPONSE_STATUS] = "404";
+                ((IDictionary)rhoResp)[RESPONSE_STATUS_MESSAGE] = "Not Found";
                 return (IDictionary)rhoResp;
             }
 
             if (CFilePath.getExtension(fullPath).Length > 0)
             {
                 ((IDictionary)rhoResp)[RESPONSE_BODY_FILEPATH] = strIndexFile;
+                ((IDictionary)rhoResp)[RESPONSE_STATUS] = "200";
+                ((IDictionary)rhoResp)[RESPONSE_STATUS_MESSAGE] = "Ok";
                 return (IDictionary)rhoResp;
             }