test template (file > open)

bit9labs · Jul 27, 2018 · 92f1586 · 92f1586
1 parent bae1ef1
commit 92f1586
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 64 deletions.
diff --git a/images/_sprites.png b/images/_sprites.png
diff --git a/images/json-test.json → images/test-collection.json b/images/json-test.json → images/test-collection.json
diff --git a/src/js/config-menu.js b/src/js/config-menu.js
@@ -8,10 +8,11 @@ var menu_template = `
  <li class="more">
  <a class="trn" href="#">Open</a>
  <ul>
- <li><a class="trn dots" data-target="file/open.open_file" href="#">Open File</a></li>
+ <li><a class="trn dots" data-target="file/open.open_file" data-key="Drag&Drop" href="#">Open File</a></li>
  <li><a class="trn dots" data-target="file/open.open_dir" href="#">Open Directory</a></li>
  <li><a class="trn dots" data-target="file/open.open_url" href="#">Open URL</a></li>
  <li><a class="trn dots" data-target="file/open.open_data_url" href="#">Open Data URL</a></li>
+ <li><a class="trn dots" data-target="file/open.open_template_test" href="#">Open test template</a></li>
  </ul>
  </li>
  <li><a class="trn dots" data-target="file/search.search" href="#">Search images</a></li>

diff --git a/src/js/modules/file/open.js b/src/js/modules/file/open.js
@@ -227,6 +227,18 @@ class File_open_class {
  FR.readAsDataURL(f);
  }
  }
+
+ open_template_test(){
+ var _this = this;
+
+ window.fetch("./../../../../images/test-collection.json").then(function(response) {
+ return response.json();
+ }).then(function(json) {
+ _this.load_json(json, false);
+ }).catch(function(ex) {
+ alertify.error('Sorry, image could not be loaded.');
+ });
+ }
 
  /**
  * check if url has url params, for example: http:https://viliusle.github.io/miniPaint/?image=http:https://i.imgur.com/ATda8Ae.jpg
@@ -276,7 +288,11 @@ class File_open_class {
  }
 
  load_json(data) {
- var json = JSON.parse(data);
+ var json;
+ if(typeof data == 'string')
+ json = JSON.parse(data);
+ else
+ json = data;
  if (json.info.version == undefined) {
  json.info.version = "3";
  }