v0.0.19

lib/zfben_libjs/helpers.rb

@@ -1,7 +1,7 @@
 module Zfben_libjs::Helpers
   Lib_version = Time.now.strftime('?%s')
   def lib *opts
-    html = ''
+    html = lib_js 'lib.js'
     unless opts.blank?
       preload = []
       lib_preload = []
@@ -13,6 +13,7 @@ def lib *opts
           lib_preload.push name
         end
       end
+
       if preload.length > 0
         preload.each do |url|
           if url.end_with?('.css')
@@ -22,10 +23,9 @@ def lib *opts
           end
         end
       end
+
       if lib_preload.length > 0
-        html << lib_js('lib.js') << "<script>lib('#{lib_preload.join(' ')}')</script>"
-      else
-        html << '<script>lib()</script>'
+        html << "<script>lib('#{lib_preload.join(' ')}')</script>"
       end
     end
     return html

lib/zfben_libjs/lib.coffee

@@ -4,13 +4,20 @@ libs = {}
 # save loaded source to `loaded`
 loaded = {}
 
+progress_loaded_url = (url)->
+  url = url.match(/[^?]+/)[0]
+  local = location.protocol + '//' + location.host
+  if url.indexOf(local) is 0
+    url = url.substring(local.length)
+  return url
+
 for link in document.getElementsByTagName('link')
   if link.href && link.href isnt ''
-    loaded[link.href] = true
+    loaded[progress_loaded_url(link.href)] = true
 
 for script in document.getElementsByTagName('script')
   if script.src && script.src isnt ''
-    loaded[script.src] = true
+    loaded[progress_loaded_url(script.src)] = true
 
 # pending
 pending_urls = {}

zfben_libjs.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'zfben_libjs'
-  s.version     = '0.0.18'
+  s.version     = '0.0.19'
   s.authors     = ["Ben"]
   s.email       = ["ben@zfben.com"]
   s.homepage    = "https://github.com/benz303/zfben_libjs"