Merge pull request #37 from coshx/sea-shell-newt

Sea shell newt
coshx · Mar 14, 2016 · 7bb8ad4 · 7bb8ad4
2 parents 9763997 + 8dae66b
commit 7bb8ad4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/Caravel.podspec b/Caravel.podspec
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   #  summary should be tweet-length, and the description more in depth.
   #
 
-  version = "1.1.0"
+  version = "1.1.1"
 
   s.name         = "Caravel"
   s.version      = version

diff --git a/caravel/internal/proxies/WKScriptMessageHandlerProxy.swift b/caravel/internal/proxies/WKScriptMessageHandlerProxy.swift
@@ -71,7 +71,7 @@ internal class WKScriptMessageHandlerProxy: NSObject, WKScriptMessageHandler {
         let eventData = body["eventData"]
 
         iterateOverDelegates { e in
-            background { e.onMessage(busName, eventName: eventName, eventData: eventData) }
+            e.onMessage(busName, eventName: eventName, eventData: eventData)
         }
     }
 }
diff --git a/caravel/js/Gruntfile.js b/caravel/js/Gruntfile.js
@@ -1,7 +1,7 @@
 module.exports = function (grunt) {
     'use strict';
 
-    var version = '1.1.0';
+    var version = 'sea-shell-newt-v1.1.1';
 
     // Project configuration
     grunt.initConfig({

diff --git a/caravel/js/caravel.coffee b/caravel/js/caravel.coffee
@@ -13,16 +13,18 @@ class Caravel
 
   # Internal method for posting
   _post: (eventName, data) ->
+    action = null
+
     if @isUsingWKWebView
       body =
         busName: @name
         eventName: eventName
         eventData: data
-      setTimeout (() => window.webkit.messageHandlers.caravel.postMessage(body)), 0
+      action = () => window.webkit.messageHandlers.caravel.postMessage(body)
     else
       # shouldLoadRequest is only triggered when a new content is required
       # Ajax requests are useless
-      setTimeout (() =>
+      action = () =>
         iframe = document.createElement 'iframe'
         src = "caravel://host.com?busName=#{encodeURIComponent(@name)}&eventName=#{encodeURIComponent(eventName)}"
         if data?
@@ -33,7 +35,8 @@ class Caravel
         iframe.setAttribute 'src', src
         document.documentElement.appendChild iframe
         iframe.parentNode.removeChild iframe
-      ), 0
+
+    setTimeout(action, 0)
 
   getName: () ->
     @name

diff --git a/caravel/js/caravel.min.js b/caravel/js/caravel.min.js
diff --git a/swiftlint.yml b/swiftlint.yml
@@ -16,7 +16,7 @@ disabled_rules: # rule identifiers to exclude from running
   - trailing_whitespace
   # - type_body_length
   # - type_name
-  # - variable_name
+  - variable_name
   - variable_name_min_length
   # - variable_name_max_length
 included: # paths to include during linting. `--path` is ignored if present. takes precendence over `excluded`.