shutterbug 0.2.0 → 0.2.1

data/lib/shutterbug.rb

@@ -1,5 +1,5 @@
 module Shutterbug
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
   autoload :Rackapp,        "shutterbug/rackapp"
   autoload :Configuration,  "shutterbug/configuration"
   autoload :Storage,        "shutterbug/storage"

data/lib/shutterbug/handlers/shutterbug.js

@@ -207,10 +207,10 @@
 
     var htmlFragRequestListen = function(message) {
       var send_response = function(data) {
-        // Update timeout. When we receive a request from parent,
-        // we have to finish nested iframes rendering in that time.
-        // Otherwise parent rendering will timeout.
-        shutterbugInstance.iframeReqTimeout = data.iframeReqTimeout;
+        // Update timeout. When we receive a request from parent, we have to finish nested iframes 
+        // rendering in that time. Otherwise parent rendering will timeout. 
+        // Backward compatibility: Shutterbug v0.1.x don't send iframeReqTimeout.
+        shutterbugInstance.iframeReqTimeout = data.iframeReqTimeout != null ? data.iframeReqTimeout : MAX_TIMEOUT;
         shutterbugInstance.getHtmlFragment(function(html) {
           var response = {
             type:        'htmlFragResponse',
@@ -227,7 +227,9 @@
     var htmlFragResponseListen = function(message) {
       var send_response = function(data) {
         if (data.id === shutterbugInstance.id) {
-          shutterbugInstance._iframeContentRequests[data.iframeReqId].resolve(data.value);
+          // Backward compatibility: Shutterbug v0.1.x don't send iframeReqId.
+          var ifeameReqId = data.iframeReqId != null ? data.iframeReqId : 0;
+          shutterbugInstance._iframeContentRequests[ifeameReqId].resolve(data.value);
         }
       };
       handleMessage(message, 'htmlFragResponse', send_response);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutterbug
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -737520193773818108
+      hash: 4021893285741860284
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -737520193773818108
+      hash: 4021893285741860284
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25