RELEASE 1.2.1

Closes #23

Hybridge.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Hybridge"
-  s.version      = "1.2.0"
+  s.version      = "1.2.1"
   s.summary      = "Yet another javascript / mobile native simple bridge for hybrid apps, back and forth..."
 
   s.description  = <<-DESC
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios
   s.ios.deployment_target = "6.0"
-  s.source       = { :git => "https://github.com/telefonicaid/tdigital-hybridge.git", :tag => "1.2.0" }
+  s.source       = { :git => "https://github.com/telefonicaid/tdigital-hybridge.git", :tag => "1.2.1" }
 
   s.source_files = "ios/Hybridge/Hybridge/*.{h,m}"
   s.private_header_files = "ios/Hybridge/Hybridge/HYBURLProtocol.h", "ios/Hybridge/Hybridge/NSString+Hybridge.h"

README.md

@@ -55,7 +55,7 @@ You'll also need [JQuery](http://jquery.com) (version 1.8.3 or newer) for the Ja
 
 ### <a name='installation_android'>Android</a>
 
-You can build your own Hybridge, but you can start with the latest version included at [hybridge.jar](boilerplate/android/HybridgeBoilerplate/libs/hybridge-1.2.0.jar) in the boilerplate code.
+You can build your own Hybridge, but you can start with the latest version included at [hybridge.jar](boilerplate/android/HybridgeBoilerplate/libs/hybridge-1.2.1.jar) in the boilerplate code.
 
 ### <a name='installation_ios'>iOS</a>
 

android/Hybridge/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.pdi.hybridge"
     android:versionCode="120"
-    android:versionName="1.2.0" >
+    android:versionName="1.2.1" >
 
     <uses-sdk android:minSdkVersion="12" />
 

android/Hybridge/src/com/pdi/hybridge/HybridgeBroadcaster.java

@@ -37,7 +37,6 @@ public void initJs(WebView view, JSONArray actions, JSONArray events) {
                 + "window.HybridgeGlobal = {" + "  isReady : true" + ", version : "
                 + HybridgeConst.VERSION + ", versionMinor : " + HybridgeConst.VERSION_MINOR
                 + ", actions : " + actions.toString() + ", events : " + events.toString() + "};"
-                + "(window.document.getElementById('hybridgeTrigger') || {}).className = 'switch';"
                 + "},0)");
         mIsInitialized = true;
     }

android/Hybridge/version.properties

@@ -3,4 +3,4 @@
 
 build.revision.number=1
 build.major.number=2
-build.minor.number=0
+build.minor.number=1

boilerplate/ios/HybridgeSample/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Hybridge (1.2.0)
+  - Hybridge (1.2.1)
 
 DEPENDENCIES:
   - Hybridge (from `../../..`)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "hybridge",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/telefonicaid/tdigital-hybridge",
   "description": "javascript / mobile native simple bridge for hybrid apps, back and forth...",
   "main": "js/hybridge.js",

ios/Hybridge/Hybridge/HYBBridge.m

@@ -135,8 +135,7 @@ - (NSString *)prepareWebView:(UIWebView *)webView {
                                       @"		actions:%@,"
                                       @"		events:%@"
                                       @"	};"
-                                      @"	(window.document.getElementById('hybridgeTrigger') || {}).className = 'switch';"
-                                      @"}, 500);";
+                                      @"}, 0);";
 
     NSArray *actions = [@[@"init"] arrayByAddingObjectsFromArray:[self.delegate bridgeActions:self]];
     NSString *actionsString = [NSString hyb_JSONStringWithObject:actions];

ios/Hybridge/HybridgeTests/HYBBridgeTests.m

@@ -55,8 +55,7 @@ - (void)testPrepareWebView {
                            @"		actions:[\"init\",\"test\",\"do_something\"],"
                            @"		events:[\"pause\",\"resume\",\"message\",\"ready\"]"
                            @"	};"
-                           @"	(window.document.getElementById('hybridgeTrigger') || {}).className = 'switch';"
-                           @"}, 500);";
+                           @"}, 0);";
 
     [[[webView expect] andReturn:@"true"] stringByEvaluatingJavaScriptFromString:javascript];
 

js/hybridge.js

@@ -1,5 +1,5 @@
 /*!
- * tdigital-hybridge - v1.2.0
+ * tdigital-hybridge - v1.2.1
  * Bridge for mobile hybrid application between Javascript and native environment
  * (iOS & Android)
  *
@@ -341,33 +341,9 @@
           actions: [INIT_ACTION, 'message'],
           events: [READY_EVENT, 'message']
         };
-        (window.document.getElementById('hybridgeTrigger') || {}).className = 'switch';
       }, 0);
   };
 
-  /**
-   * Enables transitionend hack in to trigger callbacks directly from native
-   */
-  var _setCSSTrigger = function (callback) {
-    var transitionEnd = $.support.transition ? $.support.transition.end : 'webkitTransitionEnd';
-    var trigger = document.createElement('div');
-    trigger.id = 'hybridgeTrigger';
-    var style = document.createElement('style');
-    style.id = 'triggerStyle';
-    style.type = 'text/css';
-    style.innerHTML = '#hybridgeTrigger{top:0;-webkit-transition:top 0.0001s;' +
-      'transition:top 0.0001s;' +
-      'position:absolute;visibility:hidden}' +
-      '#hybridgeTrigger.switch{top:1px;}';
-    document.getElementsByTagName('head')[0].appendChild(style);
-    document.getElementsByTagName('body')[0].appendChild(trigger);
-    $('#hybridgeTrigger').one(transitionEnd, function() {
-      callback();
-      $('#hybridgeTrigger').remove();
-      $('#triggerStyle').remove();
-    });
-  };
-
   /**
    * Attach methods to global object in order to initialize the Hybridge properly
    * _events: Hybridge events triggered from native for client handling
@@ -486,21 +462,27 @@
   };
 
   /**
-   * Since HybridgeGlobal is set from native just add the client methods
+   * Inits ready event
    */
-  // AMD/defer load (requirejs), native bridge already loaded
-  if (typeof window.HybridgeGlobal !== 'undefined') {
-    _attachToGlobal();
-  }
-  // Minified/inmediate load, native bridge loads after
-  else {
-    _setCSSTrigger(_attachToGlobal);
-  }
+  _events.ready = _createEvent(READY_EVENT);
 
   /**
-   * Inits ready event
+   * window.HybridgeGlobal is set by the Native code in other thread outside
+   * the browser event loop.
+   * Lets going to poll for it and then we can be sure native has done
+   * its part in the handshake
+   *
+   * TODO: Refactor the handshake protocol, forcing native to start once the
+   * webview is DOMReady and a document the minimun initial DOM for using
+   * the old CSS trigger from version 1.2.0
    */
-  _events.ready = _createEvent(READY_EVENT);
+  (function _checkForGlobal() {
+    if (window.HybridgeGlobal) {
+      _attachToGlobal();
+    } else {
+      setTimeout(_checkForGlobal, 10);
+    }
+  })();
 
   /**
    * Initialize both native and javascript