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

data/platform/wp7/rhodes/App.xaml.cs

@@ -151,6 +151,7 @@ namespace Rhodes
             // Create the frame but don't set it as RootVisual yet; this allows the splash
             // screen to remain active until the application is ready to render.
             RootFrame = new PhoneApplicationFrame();
+            //RootFrame = new TransitionFrame();
             RootFrame.Navigated += CompleteInitializePhoneApplication;
 
             // Handle navigation failures

data/platform/wp7/rhodes/Properties/WMAppManifest.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2009/deployment" AppPlatformVersion="7.0">
-  <App xmlns="" ProductID="{1aa73f88-4d47-4f94-acdd-ab9301d45a2a}" Title="Rhodes" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="Rhodes author" Description="Sample description" Publisher="Rhodes">
-    <IconPath IsRelative="true" IsResource="false">icon.png</IconPath>
+<?xml version='1.0' encoding='UTF-8'?>
+<Deployment AppPlatformVersion='7.1' xmlns='http://schemas.microsoft.com/windowsphone/2009/deployment'>
+  <App Author='Rhodes author' Description='Sample description' Genre='apps.normal' ProductID='{1aa73f88-4d47-4f94-acdd-ab9301d45a2a}' Publisher='Rhodes' RuntimeType='Silverlight' Title='InSite Mobile' Version='1.0.0.0' xmlns=''>
+    <IconPath IsRelative='true' IsResource='false'>icon.png</IconPath>
     <Capabilities>
-      <Capability Name="ID_CAP_GAMERSERVICES" />
-      <Capability Name="ID_CAP_IDENTITY_DEVICE" />
-      <Capability Name="ID_CAP_IDENTITY_USER" />
-      <Capability Name="ID_CAP_LOCATION" />
-      <Capability Name="ID_CAP_MEDIALIB" />
-      <Capability Name="ID_CAP_MICROPHONE" />
-      <Capability Name="ID_CAP_NETWORKING" />
-      <Capability Name="ID_CAP_PHONEDIALER" />
-      <Capability Name="ID_CAP_PUSH_NOTIFICATION" />
-      <Capability Name="ID_CAP_SENSORS" />
-      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
+      <Capability Name='ID_CAP_GAMERSERVICES'/>
+      <Capability Name='ID_CAP_IDENTITY_DEVICE'/>
+      <Capability Name='ID_CAP_IDENTITY_USER'/>
+      <Capability Name='ID_CAP_LOCATION'/>
+      <Capability Name='ID_CAP_MEDIALIB'/>
+      <Capability Name='ID_CAP_MICROPHONE'/>
+      <Capability Name='ID_CAP_NETWORKING'/>
+      <Capability Name='ID_CAP_PHONEDIALER'/>
+      <Capability Name='ID_CAP_PUSH_NOTIFICATION'/>
+      <Capability Name='ID_CAP_SENSORS'/>
+      <Capability Name='ID_CAP_WEBBROWSERCOMPONENT'/>
     </Capabilities>
     <Tasks>
-      <DefaultTask Name="_default" NavigationPage="MainPage.xaml" />
+      <DefaultTask Name='_default' NavigationPage='MainPage.xaml'/>
     </Tasks>
     <Tokens>
-      <PrimaryToken TokenID="RhodesToken" TaskName="_default">
+      <PrimaryToken TaskName='_default' TokenID='RhodesToken'>
         <TemplateType5>
-          <BackgroundImageURI IsRelative="true" IsResource="false">Background.png</BackgroundImageURI>
+          <BackgroundImageURI IsRelative='true' IsResource='false'>Background.png</BackgroundImageURI>
           <Count>0</Count>
           <Title>Rhodes</Title>
         </TemplateType5>

data/platform/wp7/rhodes/Rhodes.csproj

@@ -13,7 +13,7 @@
     <AssemblyName>Rhodes</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
-    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>
+    <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
     <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
     <SilverlightApplication>true</SilverlightApplication>
     <SupportedCultures>
@@ -59,6 +59,7 @@
       <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Phone" />
+    <Reference Include="Microsoft.Phone.Controls.Toolkit, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b772ad94eb9ca604, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.Phone.Interop" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows" />
@@ -102,6 +103,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="SplashScreenImage.jpg" />
+    <Content Include="Toolkit.Content\ApplicationBar.Cancel.png" />
+    <Content Include="Toolkit.Content\ApplicationBar.Check.png" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\RhoRubyLib\RhoRubyLib.csproj">
@@ -109,6 +112,7 @@
       <Name>RhoRubyLib</Name>
     </ProjectReference>
   </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" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

data/rakefile.rb

@@ -150,8 +150,6 @@ def make_application_build_capabilities_header_file
   Jake.modify_file_if_content_changed(File.join($startdir, "platform", "shared", "common", "app_build_capabilities.h"), f)
 end
 
-
-
 def make_application_build_config_java_file
 
     f = StringIO.new("", "w+")
@@ -265,15 +263,12 @@ namespace "config" do
 
     application_build_configs = {}
 
-    #Process motorola extensions
-    if capabilities.index("motorola")
-        $app_config["capabilities"] += ["webkit_browser"] if $app_config["extensions"].index("webkit-browser")
-        $app_config["extensions"] += ["rhoelements"]
-        
-        idx_barcode = $app_config["extensions"].index("barcode")
-        $app_config["extensions"][idx_barcode] = "barcode-moto" if idx_barcode
-
-        $app_config["capabilities"] += ["barcode"] if $app_config["extensions"].index("barcode-moto")
+    #Process rhoelements settings
+    if $app_config["app_type"] == 'rhoelements'
+        $app_config["capabilities"] += ["motorola"] unless $app_config["capabilities"].index("motorola")
+        $app_config["extensions"] += ["rhoelementsext"] if $current_platform == 'wm'
+        $app_config["extensions"] += ["motoapi"] #extension with plug-ins
+        $app_config["extensions"] += ['webkit-browser'] unless $app_config["extensions"].index("webkit-browser")
         
         #check for RE2 plugins
         plugins = ""
@@ -284,7 +279,20 @@ namespace "config" do
             end
         end
         
+        if plugins.length() == 0
+            plugins = "ALL"    
+        end
+        
         application_build_configs['moto-plugins'] = plugins if plugins.length() > 0
+        
+    end
+    
+    if $app_config["capabilities"].index("motorola")
+        if $app_config["extensions"].index("webkit-browser")
+            $app_config["capabilities"] += ["webkit_browser"]
+            $app_config["extensions"].delete("webkit-browser")
+        end    
+        $app_config["extensions"] += ["rhoelements"]
     end
 
     puts "$app_config['extensions'] : #{$app_config['extensions'].inspect}"   
@@ -318,6 +326,10 @@ namespace "config" do
     $rhologhostport = 52363 unless $rhologhostport
 	$rhologhostaddr = Jake.localip()
 
+    $obfuscate_js = (($app_config["obfuscate"].nil? || $app_config["obfuscate"]["js"].nil?) ? nil : 1 )
+    $obfuscate_css = (($app_config["obfuscate"].nil? || $app_config["obfuscate"]["css"].nil?) ? nil : 1 )
+    $obfuscate_exclude = ($app_config["obfuscate"].nil? ? nil : $app_config["obfuscate"]["exclude_dirs"] )
+    $obfuscator = 'res/build-tools/yuicompressor-2.4.7.jar'
   end
 
   task :qt do
@@ -401,6 +413,8 @@ def set_linker_flags
 end
 
 def add_extension(path,dest)
+  puts 'add_extension - ' + path.to_s + " - " + dest.to_s
+  
   start = pwd
   chdir path if File.directory?(path)
 
@@ -417,6 +431,8 @@ def init_extensions(startdir, dest)
     
   puts 'init extensions'
   $app_config["extensions"].each do |extname|  
+    puts 'ext - ' + extname
+    
     extpath = nil
     extpaths.each do |p|
       ep = File.join(p, extname)
@@ -425,19 +441,24 @@ def init_extensions(startdir, dest)
         break
       end
     end    
+    
+    puts '1'
 
     if extpath.nil?
       begin
         $rhodes_extensions = nil
         require extname
-        extpath = $rhodes_extensions[0] unless $rhodes_extensions.nil?        
-        $app_config["extpaths"] << extpath 
+        puts '1-2'
+        if $rhodes_extensions
+            extpath = $rhodes_extensions[0]
+            $app_config["extpaths"] << extpath
+        end    
       rescue Exception => e      
         puts "exception"  
       end
     end
-    
-    unless extpath.nil?
+        
+    unless extpath.nil?      
       add_extension(extpath, dest) unless dest.nil?
 
       if $config["platform"] != "bb"
@@ -469,8 +490,10 @@ def init_extensions(startdir, dest)
             extlibs += libs
           end
         end
-      end    
+      end
+      
     end
+    
   end
   
   exts = File.join($startdir, "platform", "shared", "ruby", "ext", "rho", "extensions.c")
@@ -519,6 +542,8 @@ def init_extensions(startdir, dest)
     nativelib.each { |lib| add_linker_library(lib) }
 
     set_linker_flags
+    
+    #exit
   end
   
   unless $app_config["constants"].nil?
@@ -539,6 +564,28 @@ def init_extensions(startdir, dest)
 
 end
 
+def public_folder_cp_r(src_dir,dst_dir,level,obfuscate)
+  mkdir_p dst_dir if not File.exists? dst_dir
+  Dir.foreach(src_dir) do |filename|
+    next if filename.eql?('.') || filename.eql?('..')
+    filepath = src_dir + '/' + filename
+    dst_path = dst_dir + '/' + filename
+    if File.directory?(filepath)
+      public_folder_cp_r(filepath,dst_path,(level+1),((obfuscate==1) && ((level>0) || $obfuscate_exclude.nil? || !$obfuscate_exclude.include?(filename)) ? 1 : 0))
+    else
+      if (obfuscate==1) && (((!$obfuscate_js.nil?) && File.extname(filename).eql?(".js")) || ((!$obfuscate_css.nil?) && File.extname(filename).eql?(".css")))
+        puts Jake.run('java',['-jar', $obfuscator, filepath, '-o', dst_path])
+        unless $? == 0
+          puts "Obfuscation error"
+          exit 1
+        end
+      else
+        cp filepath, dst_path, :preserve => true
+      end
+    end
+  end
+end
+
 def common_bundle_start(startdir, dest)
   puts "common_bundle_start"
   
@@ -569,8 +616,14 @@ def common_bundle_start(startdir, dest)
   chdir startdir
   #throw "ME"
   cp_r app + '/app',File.join($srcdir,'apps'), :preserve => true
-  cp_r app + '/public', File.join($srcdir,'apps'), :preserve => true if File.exists? app + '/public'
-  cp   app + '/rhoconfig.txt', File.join($srcdir,'apps'), :preserve => true
+  if File.exists? app + '/public'
+    if $obfuscate_js.nil? && $obfuscate_css.nil?
+      cp_r app + '/public', File.join($srcdir,'apps'), :preserve => true 
+    else
+      public_folder_cp_r app + '/public', File.join($srcdir,'apps/public'), 0, 1
+    end
+  end
+  cp app + '/rhoconfig.txt', File.join($srcdir,'apps'), :preserve => true
 
   app_version = "\r\napp_version='#{$app_config["version"]}'"  
   File.open(File.join($srcdir,'apps/rhoconfig.txt'), "a"){ |f| f.write(app_version) }
@@ -601,7 +654,7 @@ def common_bundle_start(startdir, dest)
       end
       
       Dir.glob("**/*.wm.*").each { |f| rm f }
-	  Dir.glob("**/*.wp7.*").each { |f| rm f }
+	    Dir.glob("**/*.wp7.*").each { |f| rm f }
       Dir.glob("**/*.iphone.*").each { |f| rm f }
       Dir.glob("**/*.bb.*").each { |f| rm f }
       Dir.glob("**/*.bb6.*").each { |f| rm f }
@@ -637,11 +690,11 @@ def process_exclude_folders
       excl << $config["excludedirs"][exclude_platform] if $config["excludedirs"][exclude_platform]
   end  
   
-  if excl
-      chdir File.join($srcdir, 'apps')
+  if excl.size() > 0
+      chdir File.join($srcdir)#, 'apps')
   
       excl.each do |mask|
-        Dir.glob(mask).each {|f| rm_rf f}
+        Dir.glob(mask).each {|f| puts "f: #{f}"; rm_rf f}
       end
   end
 
@@ -824,21 +877,17 @@ namespace "build" do
         sh %{zip -r upgrade_bundle.zip .}
       end
 
-      
       cp   new_zip_file, $bindir
       
       rm   new_zip_file
       
-      
-      
     end
     
-    
-    
+
     task :noiseq do
       app = $app_path
       rhodeslib = File.dirname(__FILE__) + "/lib/framework"
-	  compileERB = "lib/build/compileERB/bb.rb"
+	    compileERB = "lib/build/compileERB/bb.rb"
       startdir = pwd
       dest = $srcdir + "/lib"      
 

data/res/build-tools/YUICompressorLicense.txt

@@ -0,0 +1,54 @@
+YUI Compressor Copyright License Agreement (BSD License)
+
+Copyright (c) 2011, Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of Yahoo! Inc. nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This software also requires access to software from the following sources:
+
+The Jarg Library v 1.0 ( http://jargs.sourceforge.net/ ) is available
+under a BSD License � Copyright (c) 2001-2003 Steve Purcell,
+Copyright (c) 2002 Vidar Holen, Copyright (c) 2002 Michal Ceresna and
+Copyright (c) 2005 Ewan Mellor.
+
+The Rhino Library ( http://www.mozilla.org/rhino/ ) is dually available
+under an MPL 1.1/GPL 2.0 license, with portions subject to a BSD license.
+
+Additionally, this software contains modified versions of the following
+component files from the Rhino Library:
+
+[org/mozilla/javascript/Decompiler.java]
+[org/mozilla/javascript/Parser.java]
+[org/mozilla/javascript/Token.java]
+[org/mozilla/javascript/TokenStream.java]
+
+The modified versions of these files are distributed under the MPL v 1.1
+( http://www.mozilla.org/MPL/MPL-1.1.html )

data/res/generators/templates/application/app/layout.erb

@@ -15,6 +15,7 @@
     <%% end %>
 
     <%% if System::get_property('platform') == 'WP7' %>
+        <meta http-equiv="X-UA-Compatible" content="IE=9"/>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <%% end %>
 

data/res/generators/templates/application/public/js/jquery-wp7-patch.js

@@ -67,6 +67,13 @@
 
     var _ajax = $.ajax;
 
+    function isLocalUrl(url) {
+        //console.log('isLocalUrl: ' +url);
+        if (url.match(/^https?:\/\//) &&
+            !url.match(/^https?:\/\/(127\.0\.0\.1|localhost)/)) return false;
+        return true;
+    }
+
     function wp7ajax() {
         //console.log('in wp7ajax');
         //console.log('window.location: ' +window.location);
@@ -75,8 +82,7 @@
         //console.log('options has been normalized, options.url == "' +options.url +'"');
 
         // if we have URL in request options and it is a local URL
-        if (options.url.match(/^https?:\/\/(127\.0\.0\.1|localhost)/) ||
-            options.url.match(/^x-wmapp1:/)) {
+        if (isLocalUrl(options.url)) {
             //console.log('it is a local app URL');
             // then call proxy
             return wp7notifyProxy.apply(this, [options]);

data/res/generators/templates/application/public/js/syncengine.js

@@ -0,0 +1,147 @@
+(function(){
+    // =========================================================================================
+    // This library is for performing ajax calls to sync engine from javascript, no jQuery used.
+    // =========================================================================================
+
+    var URL_dosync = "/system/syncengine/dosync";
+    var URL_syncdb = "/system/syncdb";
+    
+    function buildQuery(params) {
+        var query = "";
+        for (var key in params) {
+            if (params.hasOwnProperty(key)) {
+                var type = typeof params[key];
+                if ('string' == type || 'number' == type) {
+                    if (0 < query.length) query = query + '&';
+                    query = query + encodeURI(key) + '=' + encodeURI(params[key]);
+                }
+            }
+        }
+        return query;
+    }
+
+    var xhr=false;
+    /*
+        Option names are:
+            type    - request type (optional, 'GET' by default)
+            url     - request URL
+            query   - request query string, may be defined as string or an object with properties (optional)
+            body    - request body (optional)
+            success - request success handler (optional)
+            error   - request error handler (optional)
+     */
+    function request(opts, that) {
+
+        // attempt to create XHR
+        if (!xhr) {
+            try {
+                if ('undefined' != typeof XMLHttpRequest)
+                    xhr = new XMLHttpRequest();
+                else if (window.createRequest)
+                    xhr = window.createRequest();
+            } catch(ex) {
+                xhr = false;
+            }
+        }
+
+        if (xhr) {
+            // ensure required opts are defined
+            if ('object' != typeof opts)
+                opts = {};
+            if ('string' != typeof opts.type)
+                opts.type = 'GET';
+            if ('string' != typeof opts.url)
+                opts.url = '';
+            if ('undefined' == typeof opts.query)
+                opts.query = '';
+            if ('object' == typeof opts.query)
+                opts.query = buildQuery(opts.query);
+            if ('undefined' == typeof opts.body)
+                opts.body = null;
+            if ('function' != typeof opts.success)
+                opts.success = function(){};
+            if ('function' != typeof opts.error)
+                opts.error = function(){};
+
+            var q = opts.query;
+            if (0 < q.length)
+                q = '?' + q;
+            
+            xhr.open(opts.type, opts.url + q, true /*it is async request*/);
+            xhr.onreadystatechange = function () {
+                if (xhr.readyState == 4) {
+                    opts.success.apply('undefined' == typeof that ? this : that, [
+                        xhr.response, xhr.status, xhr
+                    ]);
+                }
+            };
+            xhr.onerror = function () {
+                opts.error.apply('undefined' == typeof that ? this : that, [
+                    xhr.response, "error", xhr
+                ]);
+            }
+            xhr.ontimeout = function () {
+                opts.error.apply('undefined' == typeof that ? this : that, [
+                    "", "timeout", xhr
+                ]);
+            }
+            xhr.send(opts.body);
+        }
+    }
+
+
+    function dosync(/*bool*/ show_status_popup, /*const char **/ query_params) {
+        request({
+            url: URL_syncdb,
+            query: {
+                show_status_popup: 'undefined' != show_status_popup && show_status_popup ? 'true' : 'false',
+                query_params: query_params
+            }
+        });
+    }
+
+
+
+/*
+extern VALUE dosync_source(VALUE source_id, bool show_status_popup, const char * query_params);
+
+// extern VALUE dosearch(VALUE ar_sources, const char *from, const char *params, bool sync_changes, int nProgressStep, const char* callback, const char* callback_params);
+// extern VALUE login(const char *login, const char *password, const char* callback);
+
+extern int logged_in();
+extern void logout();
+extern void stop_sync();
+extern void set_notification(int source_id, const char *url, char* params);
+extern void clear_notification(int source_id);
+
+extern int set_pollinterval(int interval);
+extern int get_pollinterval();
+
+extern void set_syncserver(char* syncserver);
+
+//extern VALUE get_src_attrs(const char* szPartition, int source_id);
+//extern VALUE is_blob_attr(const char* szPartition, int source_id, const char* szAttrName);
+
+extern void  set_objectnotify_url(const char* szUrl);
+extern void  add_objectnotify(int nSrcID, const char* szObject);
+extern void  clean_objectnotify();
+
+//extern int   get_lastsync_objectcount(int nSrcID);
+//extern int   get_pagesize();
+
+extern void  set_pagesize(int pagesize);
+extern void  set_threaded_mode(bool b);
+extern void  enable_status_popup(bool b);
+extern void  set_source_property(int nSrcID, const char* szPropName, const char* szPropValue);
+extern void  set_ssl_verify_peer(bool b);
+extern void  update_blob_attribs(const char* szPartition, int source_id);
+
+extern VALUE is_syncing();
+
+extern void  register_push();
+*/
+
+    window.Rho = window.Rho || {};
+    window.Rho.dosync = dosync;
+
+})();