easymarklet 0.0.10 → 0.0.11

data/app/assets/javascripts/easymarklet/consumer.js.erb

@@ -15,11 +15,16 @@
     var easymarkletDiv = null;
 
     var consumer_url = encodeURIComponent(document.location);
-    var protocol = (document.location.href.substring(0,8) === 'https://') ? 'https://' : 'http://'
+    // Try to determine the protocol to be used based on the current page
+    var protocol = (document.location.href.substring(0,8) === 'https') ? 'https' : 'http'
+    // Allow protocol to be overridden by the bookmarklet definition
+    if(bookmarklet.protocol){
+      protocol = bookmarklet.protocol;
+    }
     var host = '<%= Rails.application.config.action_controller.default_url_options[:host] %>';
     var port = '<%= Rails.application.config.action_controller.default_url_options[:port] %>';
     port = port === '' ? '' : ':' + port;
-    var full_host = protocol + host + port;
+    var full_host = protocol  + '://' + host + port;
 
     // Once easyXDM is available this will create an iframe and set up the RPC channel
     function scriptOnLoad(){

data/lib/easymarklet/version.rb

@@ -1,3 +1,3 @@
 module Easymarklet
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easymarklet
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4147224777850264723
+      hash: 330017604297569305
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4147224777850264723
+      hash: 330017604297569305
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24