convert JSONLoader to Singleton

christian-fei · Jun 7, 2015 · 199991c · 199991c
1 parent 81309d9
commit 199991c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/dest/jekyll-search.js b/dest/jekyll-search.js
diff --git a/src/JSONLoader.js b/src/JSONLoader.js
@@ -1,18 +1,20 @@
-module.exports = function JSONLoader(){
-  this.load = function(location,callback){
-    var xhr = (window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP")
-    xhr.open("GET", location, true)
+module.exports = {
+  load: load
+}
+
+function load(location,callback){
+  var xhr = (window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP")
+  xhr.open("GET", location, true)
 
-    xhr.onreadystatechange = function(){
-      if ( xhr.status==200 && xhr.readyState==4 ){
-        try{
-          callback(null, JSON.parse(xhr.responseText) )
-        }catch(err){
-          callback(err, null)
-        }
+  xhr.onreadystatechange = function(){
+    if ( xhr.status==200 && xhr.readyState==4 ){
+      try{
+        callback(null, JSON.parse(xhr.responseText) )
+      }catch(err){
+        callback(err, null)
       }
     }
-
-    xhr.send()
   }
+
+  xhr.send()
 }
diff --git a/src/index.js b/src/index.js
@@ -4,9 +4,7 @@
   var searcher = require('./Searcher')
   var templater = require('./Templater')
   var store = require('./Store')
-  var JSONLoader = require('./JSONLoader')
-
-  var jsonLoader
+  var jsonLoader = require('./JSONLoader')
 
   var requiredOptions = [
     'searchInput',
@@ -28,7 +26,6 @@
   window.SimpleJekyllSearch = function SimpleJekyllSearch(_opt){
     opt = validateOptions(_opt)
     searcher.setOptions(_opt)
-    jsonLoader = new JSONLoader()
 
     isJSON(opt.json) ?
       initWithJSON(opt.json) :