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

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

@@ -473,7 +473,7 @@ namespace rho.net
 
             if ((strBody != null && strBody.length() > 0) || m_isPullFile || m_isMultiPart)
 			{
-                if (oSession != null && !m_isPullFile)
+                if (oSession != null && !m_isPullFile && !m_isMultiPart)
                     m_webRequest.ContentType = oSession.getContentType();
                 else if (m_isMultiPart)
                     m_webRequest.ContentType = "multipart/form-data; boundary=----------A6174410D6AD474183FDE48F5662FCC5";

data/platform/wp7/RhoRubyLib/rubyext/RhoDateTimePicker.cs

@@ -0,0 +1,237 @@
+/*------------------------------------------------------------------------
+* (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;
+using Microsoft.Phone.Tasks;
+using rho.common;
+using System.Globalization;
+using System.Windows;
+using Microsoft.Phone.Controls;
+using rho.views;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Navigation;
+using Microsoft.Phone.Controls.Primitives;
+
+
+namespace rho.rubyext
+{
+    [RubyModule("DateTimePicker")]
+    public static class RhoDateTimePicker
+    {
+        private static RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() :
+            new RhoLogger("RhoDateTimePicker");
+        private static CRhoRuby RhoRuby { get { return CRhoRuby.Instance; } }
+        private static CRhodesApp RHODESAPP() { return CRhodesApp.Instance; }
+        private static PhoneApplicationFrame m_frame = null;
+        private static object m_frameContentWhenOpened;
+        private static RhoDateTimeDlg m_dateTimePickerPage = null;
+        private static DateTime m_dateValue;
+        private static DateTime m_timeValue;
+        private static String m_callback = "";
+        private static String m_title = "";
+        private static String m_opaque = null;
+        private static int m_fmt = 0;
+        
+
+        #region Private Implementation Details
+
+        #endregion
+
+        #region Private Instance & Singleton Methods
+
+
+        [RubyMethodAttribute("choose", RubyMethodAttributes.PublicSingleton)]
+        public static void choose(RubyModule/*!*/ self, params object[] args)
+        {
+            try
+            {
+                if (args != null && args.Length != 4 && args.Length != 5)
+                    throw RubyExceptionData.InitializeException(new RuntimeError("wrong number of arguments"), "wrong number of arguments");
+
+                if (args.Length == 5)
+                    m_opaque = args[4].ToString();
+
+                m_fmt = int.Parse(args[3].ToString());
+
+                m_callback = args[0].ToString();
+                m_title = args[1].ToString();
+                //long init = args[2].toRubyTime().getTime();
+
+                RHODESAPP().MainPage.Dispatcher.BeginInvoke(() =>
+                {
+                    OpenPickerPage();
+                });
+            }
+            catch (Exception ex)
+            {
+                Exception rubyEx = self.Context.CurrentException;
+                if (rubyEx == null)
+                {
+                    rubyEx = RubyExceptionData.InitializeException(new RuntimeError(ex.Message.ToString()), ex.Message);
+                }
+                LOG.ERROR("choose", ex);
+                throw rubyEx;
+            }
+        }
+
+        [RubyMethodAttribute("choose_with_range", RubyMethodAttributes.PublicSingleton)]
+        public static void choose_with_range(RubyModule/*!*/ self, params object[] args)
+        {
+            try
+            {
+                if (args != null && args.Length != 4 && args.Length != 5)
+                    throw RubyExceptionData.InitializeException(new RuntimeError("wrong number of arguments"), "wrong number of arguments");
+
+                if (args.Length == 5)
+                    m_opaque = args[4].ToString();
+
+                m_fmt = int.Parse(args[3].ToString());
+
+                m_callback = args[0].ToString();
+                m_title = args[1].ToString();
+                //long init = args[2].toRubyTime().getTime();
+                //long min_t = args[5].toRubyTime().getTime();
+                //long max_t = args[6].toRubyTime().getTime();
+
+                RHODESAPP().MainPage.Dispatcher.BeginInvoke(() =>
+                {
+                    OpenPickerPage();
+                });
+            }
+            catch (Exception ex)
+            {
+                Exception rubyEx = self.Context.CurrentException;
+                if (rubyEx == null)
+                {
+                    rubyEx = RubyExceptionData.InitializeException(new RuntimeError(ex.Message.ToString()), ex.Message);
+                }
+                LOG.ERROR("choose_with_range", ex);
+                throw rubyEx;
+            }
+        }
+
+        #endregion
+
+        #region Helpers
+
+        private static void OpenPickerPage()
+        {
+            if (null == m_frame)
+            {
+                m_frame = Application.Current.RootVisual as PhoneApplicationFrame;
+                if (null != m_frame)
+                {
+                    m_frameContentWhenOpened = m_frame.Content;
+
+                    m_frame.Navigated += OnFrameNavigated;
+                    m_frame.NavigationStopped += OnFrameNavigationStoppedOrFailed;
+                    m_frame.NavigationFailed += OnFrameNavigationStoppedOrFailed;
+
+                    m_frame.Navigate(new Uri("/RhoRubyLib;component/views/RhoDateTimeDlg.xaml", UriKind.Relative));
+                    RHODESAPP().m_transition = true;
+                }
+            }
+
+        }
+
+        private static void ClosePickerPage()
+        {
+            if (null != m_frame)
+            {
+                m_frame.Navigated -= OnFrameNavigated;
+                m_frame.NavigationStopped -= OnFrameNavigationStoppedOrFailed;
+                m_frame.NavigationFailed -= OnFrameNavigationStoppedOrFailed;
+
+                m_frame = null;
+                m_frameContentWhenOpened = null;
+            }
+
+            if (null != m_dateTimePickerPage)
+            {
+                m_dateValue = m_dateTimePickerPage.m_dateValue;
+                m_timeValue = m_dateTimePickerPage.m_timeValue;
+                DateTime result = new DateTime();
+
+                switch(m_fmt)
+                {
+                    case 0:
+                        result = m_dateValue;//TODO// + m_timeValue;
+                        break;
+                    case 1:
+                        result = m_dateValue;
+                        break;
+                    case 2:
+                        result = m_timeValue;
+                        break;
+                    default:
+                        break;
+                }
+
+                long sec = (result - new DateTime(1970, 1, 1)).Ticks / 10000000;
+
+                if (m_callback != "")
+                {
+                    m_callback = RHODESAPP().canonicalizeRhoUrl(m_callback);
+                    String body ="";
+                    if(m_dateTimePickerPage.m_cancel == false)
+                        body += "status=ok&result=" + sec.ToString();
+                    else
+                        body += "status=cancel";
+                    if (m_opaque != null)
+                        body += "&opaque=" + m_opaque;
+                    body += "&rho_callback=1";
+                    RhoClassFactory.createNetRequest().pushData(m_callback, body, null);
+                    //m_frame.InvalidateArrange();
+                }
+                m_dateTimePickerPage = null;
+            }
+        }
+
+        private static void OnFrameNavigated(object sender, NavigationEventArgs e)
+        {
+            if (e.Content == m_frameContentWhenOpened)
+                ClosePickerPage();
+            else if (null == m_dateTimePickerPage)
+                m_dateTimePickerPage = e.Content as RhoDateTimeDlg;
+        }
+
+        private static void OnFrameNavigationStoppedOrFailed(object sender, EventArgs e)
+        {
+            ClosePickerPage();
+        }
+
+        #endregion
+
+    }
+}

data/platform/wp7/RhoRubyLib/rubyext/RhoWebView.cs

@@ -49,7 +49,7 @@ 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)
         {
             try
             {
@@ -68,7 +68,7 @@ namespace rho.rubyext
         }
 
         [RubyMethodAttribute("refresh", RubyMethodAttributes.PublicSingleton)]
-        public static void Refresh(RubyModule/*!*/ self, int index = 0)
+        public static void Refresh(RubyModule/*!*/ self, int index = -1)
         {
             try
             {
@@ -87,7 +87,7 @@ namespace rho.rubyext
         }
 
         [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)
         {
             try
             {
@@ -116,12 +116,12 @@ namespace rho.rubyext
         }
 
         [RubyMethodAttribute("current_location", RubyMethodAttributes.PublicSingleton)]
-        public static String currentLocation(RubyModule/*!*/ self)
+        public static String currentLocation(RubyModule/*!*/ self, int index = -1)
         {
             String res = "";
             try
             {
-                res = RHODESAPP().getCurrentUrl(0);
+                res = RHODESAPP().getCurrentUrl(index);
             }
             catch (Exception ex)
             {

data/platform/wp7/RhoRubyLib/views/RhoDateTimeDlg.xaml

@@ -0,0 +1,37 @@
+<phone:PhoneApplicationPage  x:Class="rho.views.RhoDateTimeDlg"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:tk="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls"
+    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit"             
+    mc:Ignorable="d"
+    FontFamily="{StaticResource PhoneFontFamilyNormal}"
+    FontSize="{StaticResource PhoneFontSizeNormal}"
+    Foreground="{StaticResource PhoneForegroundBrush}"
+                
+    d:DesignHeight="800" d:DesignWidth="480">
+
+    <Grid x:Name="LayoutRoot" Background="{StaticResource PhoneChromeBrush}" IsHitTestVisible="True">
+        <StackPanel Orientation="Vertical" x:Name="ContentPanel" >
+            <TextBlock Text="select date" Style="{StaticResource PhoneTextNormalStyle}"/>
+            <toolkit:DatePicker Name="dateField" ValueChanged="DatePicker_ValueChanged" />
+            <TextBlock Text="select time" Style="{StaticResource PhoneTextNormalStyle}"/>
+            <toolkit:TimePicker Name="timeField" ValueChanged="TimePicker_ValueChanged"/>
+            <Grid x:Name="btngrid" Background="{StaticResource PhoneChromeBrush}" IsHitTestVisible="True">
+            <Button Content="OK"
+            x:Name="doneButton" VerticalAlignment="Bottom"
+            d:LayoutOverrides="Width"
+            HorizontalAlignment="Center" Margin="129,0,267,6" 
+            Click="OnDoneButtonClick"/>
+            <Button Content="Cancel"
+            x:Name="cancelButton" VerticalAlignment="Bottom"
+            d:LayoutOverrides="Width"
+            HorizontalAlignment="Center" Margin="218,0,136,6" 
+            Click="OnCancelButtonClick"/>
+            </Grid>
+        </StackPanel>
+    </Grid>
+</phone:PhoneApplicationPage>

data/platform/wp7/RhoRubyLib/views/RhoDateTimeDlg.xaml.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using Microsoft.Phone.Controls;
+using rho.rubyext;
+
+namespace rho.views
+{
+    public partial class RhoDateTimeDlg : PhoneApplicationPage 
+    {
+
+        public DateTime m_dateValue;
+        public DateTime m_timeValue;
+        public bool m_cancel = false;
+
+        public RhoDateTimeDlg()
+        {
+            InitializeComponent();
+        }
+
+        private void ClosePickerPage()
+        {
+            NavigationService.GoBack();
+        }
+
+
+        private void DatePicker_ValueChanged(object sender, DateTimeValueChangedEventArgs e)
+        {
+
+        }
+
+        private void TimePicker_ValueChanged(object sender, DateTimeValueChangedEventArgs e)
+        {
+
+        }
+
+        private void OnDoneButtonClick(object sender, EventArgs e)
+        {
+            m_dateValue = dateField.Value.Value;//.Date.ToShortDateString();
+            m_timeValue = timeField.Value.Value;//.ToShortTimeString();
+            m_cancel = false;
+            ClosePickerPage();
+        }
+
+        private void OnCancelButtonClick(object sender, EventArgs e)
+        {
+            m_cancel = true;
+            ClosePickerPage();
+        }
+    }
+}

data/platform/wp7/RhoRubyLib/views/RhoView.xaml.cs

@@ -1,30 +1,4 @@
-/*------------------------------------------------------------------------
-* (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 System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -55,28 +29,28 @@ namespace rho.views
         private Stack<Uri> m_backHistory = new Stack<Uri>();
         private Stack<Uri> m_forwardHistory = new Stack<Uri>();
         /// <summary>
-        /// 
+        ///
         /// </summary>
         //private Hash m_menuItems = null;
         private Uri m_currentUri = null;
         private PhoneApplicationPage m_mainPage = null;
         private Grid m_layoutRoot = null;
-        public  PhoneApplicationPage MainPage { set { m_mainPage = value; } }
-        public  Grid MainPageLayoutRoot { set { m_layoutRoot = value; } }
+        public PhoneApplicationPage MainPage { set { m_mainPage = value; } }
+        public Grid MainPageLayoutRoot { set { m_layoutRoot = value; } }
         private String m_strAction = null;
         private bool m_reload = false;
         private bool m_loadFirstTime = true;
         private bool m_masterView = false;
         private int m_index = -1;
         private bool m_callback = false;
-        
+
         private const string AJAX_CONTEXT_PARAM = "_rho_callbackId";
         private const string JS_NOTIFY_CONSOLE_LOG = "console.log:";
         private const string JS_NOTIFY_CONSOLE_INFO = "console.info:";
         private const string JS_NOTIFY_CONSOLE_WARNING = "console.warn:";
         private const string JS_NOTIFY_CONSOLE_ERROR = "console.error:";
         private const string JS_NOTIFY_REQUEST = "request:";
-        private const string REQUEST_URL_SCHEME = "x-wmapp1:";
+        private const string REQUEST_URL_SCHEME_PREFIX = "x-wmapp";
 
         //TO DO history. each time we have to save our current state of rhodesapp in rhoview entity
         public Stack<Uri> BackHistory { set { m_backHistory = value; } }
@@ -95,7 +69,7 @@ namespace rho.views
             webBrowser1.Navigated += WebBrowser_OnNavigated;
             webBrowser1.ScriptNotify += WebBrowser_OnScriptNotify;
         }
-        
+
         public RhoView(PhoneApplicationPage mainPage, Grid layoutRoot, String strAction,
                        bool reload, Brush webBkgColor, int index)
         {
@@ -121,6 +95,12 @@ namespace rho.views
         private void WebBrowser_OnLoaded(object sender, RoutedEventArgs e)
         {
             if (RHODESAPP().Tab != null && RHODESAPP().Tab.SelectedIndex != m_index) return;
+            if (RHODESAPP().m_transition)
+            {
+                RHODESAPP().m_transition = false;
+
+                return;
+            }
             OperatingSystem os = Environment.OSVersion;
             Version vs = os.Version;
             if (vs.Minor < 10) m_reload = true;
@@ -156,7 +136,8 @@ namespace rho.views
 
         private void WebBrowser_OnNavigating(object sender, NavigatingEventArgs e)
         {
-            if (!RHODESAPP().HttpServer.processBrowserRequest(e.Uri, null))
+            var tabIndex = RHODESAPP().getTabIndexFor(sender);
+            if (!RHODESAPP().HttpServer.processBrowserRequest(e.Uri, null, tabIndex))
                 return;
 
             e.Cancel = true;
@@ -173,7 +154,7 @@ namespace rho.views
             if (-1 == idx)
                 return null;
 
-            string context = uri.substring(idx + 1);  // +1 due to the '=' sign after param name
+            string context = uri.substring(idx + 1); // +1 due to the '=' sign after param name
 
             idx = context.indexOf('&');
             if (-1 < idx)
@@ -182,6 +163,15 @@ namespace rho.views
             return context;
         }
 
+        private String pathFromUrl(String url)
+        {
+            if (0 == url.IndexOf(REQUEST_URL_SCHEME_PREFIX))
+            {
+                return url.substring(url.indexOf(":") + 1);
+            }
+            return url;
+        }
+
         private void WebBrowser_OnScriptNotify(object sender, NotifyEventArgs e)
         {
             string request = e.Value;
@@ -209,7 +199,7 @@ namespace rho.views
                 IDictionary res = null;
                 try
                 {
-                    res = (IDictionary) fastJSON.RJSONTokener.JsonDecode(req);
+                    res = (IDictionary)fastJSON.RJSONTokener.JsonDecode(req);
                 }
                 catch (Exception ex)
                 {
@@ -223,19 +213,22 @@ namespace rho.views
                     string type = res["type"].ToString().toUpperCase();
                     string contentType = res["contentType"].ToString();
                     IDictionary headers = (IDictionary)res["headers"];
+                    headers["X-Requested-With"] = "XMLHttpRequest";
                     IDictionary data = (IDictionary)res["data"];
+
                     string httpUsername = (null == res["usename"]) ? null : res["usename"].ToString();
                     string httpPassword = (null == res["password"]) ? null : res["password"].ToString();
+                    string ajaxContext = data[AJAX_CONTEXT_PARAM].ToString();
 
-                    headers["X-Requested-With"] = "XMLHttpRequest";
+                    int tabIdx = RHODESAPP().getTabIndexFor(sender);
 
-                    string ajaxContext = data[AJAX_CONTEXT_PARAM].ToString();
                     if (!RHODESAPP().HttpServer.processBrowserRequest(
                         type,
-                        new Uri(url.substring(REQUEST_URL_SCHEME.length()), UriKind.Relative),
+                        new Uri(pathFromUrl(url), UriKind.Relative),
                         headers,
                         data,
-                        ajaxContext
+                        ajaxContext,
+                        tabIdx
                         ))
                     {
                         LOG.ERROR("External requests should be filtered in javascript");
@@ -254,4 +247,4 @@ namespace rho.views
             WebBrowser_OnLoaded(this, null);
         }
     }
-}
+}