load gist/url via url params, #170

cugos · Sep 13, 2015 · 53d94c3 · 53d94c3
1 parent b41bce6
commit 53d94c3
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 13 deletions.
diff --git a/src/js/dropchop.js b/src/js/dropchop.js
@@ -26,6 +26,11 @@ var dropchop = (function(dc) {
     // setup forms
     dc.form.init();
 
+    // get URL information if it exists
+    if(location.search.length) {
+      dc.util.executeUrlParams();
+    }
+
   };
 
   dc.boom = function() {

diff --git a/src/js/dropzone.dropchop.js b/src/js/dropzone.dropchop.js
@@ -31,19 +31,11 @@ var dropchop = (function(dc) {
       $(this).removeClass('dragging');
       var files = event.originalEvent.dataTransfer.files;
       $(files).each(function(i) {
-        dc.dropzone.read(files[i]);
+        dc.util.readFile(files[i]);
       });
     });
   }
 
-  dc.dropzone.read = function(file) {
-    var reader = new FileReader();
-    reader.readAsText(file, 'UTF-8');
-    reader.onload = function() {
-      $(dc.layers).trigger('file:added', [file.name, JSON.parse(reader.result)]);
-    };
-  };
-
   return dc;
 
 })(dropchop || {});
diff --git a/src/js/ops.dropchop.js b/src/js/ops.dropchop.js
@@ -113,7 +113,6 @@ var dropchop = (function(dc) {
 
     // merge params with options array
     data.options = $.merge(geoms, params);
-    console.log(data.options);
 
     // create name array
     data.name = dc.util.concat(nameArray, '_', operation);

diff --git a/src/js/ops.file.dropchop.js b/src/js/ops.file.dropchop.js
@@ -21,7 +21,7 @@ var dropchop = (function(dc) {
           .on('change', function() {
             var files = this.files;
             $(files).each(function(i) {
-              dc.dropzone.read(files[i]);
+              dc.util.readFile(files[i]);
             });
             $blindInput.remove();
           });
@@ -47,7 +47,7 @@ var dropchop = (function(dc) {
       },
       get: function(event, name, parameters) {
         var url = parameters[0];
-        dc.util.xhr(url, this.file[name].callback);
+        dc.util.xhr(url, dc.ops.file[name].callback);
       },
       callback: function(xhr, xhrEvent) {
         if (xhr.status === 200) {
@@ -77,7 +77,7 @@ var dropchop = (function(dc) {
       get: function(event, name, parameters) {
         var gist = parameters[0].split('/')[parameters[0].split('/').length-1];
         var url = 'https://api.github.com/gists/' + gist;
-        dc.util.xhr(url, this.file[name].callback);
+        dc.util.xhr(url, dc.ops.file[name].callback);
       },
       callback: function(xhr, xhrEvent) {
         if (xhr.status === 200) {

diff --git a/src/js/util.dropchop.js b/src/js/util.dropchop.js
@@ -36,6 +36,45 @@ var dropchop = (function(dc) {
     xhr.send();
   };
 
+  dc.util.readFile = function(file) {
+    var reader = new FileReader();
+    reader.readAsText(file, 'UTF-8');
+    reader.onload = function() {
+      $(dc.layers).trigger('file:added', [file.name, JSON.parse(reader.result)]);
+    };
+  };
+
+  dc.util.jsonFromUrl = function() {
+    var query = location.search.substr(1);
+    var result = {};
+    query.split("&").forEach(function(part) {
+      var item = part.split("=");
+      if (!result[item[0]]) {
+        result[item[0]] = [];
+      }
+      result[item[0]].push(decodeURIComponent(item[1]));
+    });
+    return result;
+  };
+
+  dc.util.executeUrlParams = function() {
+    var data = dc.util.jsonFromUrl();
+
+    // load gist
+    if (data.gist && data.gist.length) {
+      $(data.gist).each(function(i) {
+        dc.ops.file['load-gist'].get({}, 'load-gist', [data.gist[i]]);
+      });
+    }
+
+    // load
+    if (data.url && data.url.length) {
+      $(data.url).each(function(i) {
+        dc.ops.file['load-url'].get({}, 'load-url', [data.url[i]]);
+      });
+    }
+  }
+
   return dc;