Merge pull request #12 from MCStreetguy/dev

FIX: jQuery Bug

Author: Maximilian Schmidt

LICENSE.md

@@ -34,4 +34,4 @@ They are not associated with this license. This applies to imported sources,
 to contents that are part of the source code and to contents that are not
 authored by the copyright holder. External content that is part of the source
 code is labeled by a comment containing the source's name and uri. Contents that
-are not authored by the copyright holder are located within the `externals/` folder.
+are not authored by the copyright holder are located within the `lib/externals/` folder.

externals/.gitkeep lib/externals/.gitkeepexternals/.gitkeep renamed to lib/externals/.gitkeep

@@ -96,10 +96,10 @@ export default {
     if(window.localStorage.getItem('snippet-injector-debug') === 'true') {
       if(window.localStorage.getItem('snippet-injector-debug-time') === 'true') {
         window.localStorage.setItem('snippet-injector-debug-time',false.toString());
-        atom.notifications.addInfo('Disabled timings debug.', {detail: 'Reload the window (with Ctrl+Shift+F5 e.g.) to let the changes take effect.'});
+        atom.notifications.addInfo('Disabled timings debug.', {detail: 'Reload the window (Ctrl+Shift+F5) to let the changes take effect.'});
       } else {
         window.localStorage.setItem('snippet-injector-debug-time',true.toString());
-        atom.notifications.addInfo('Enabled timings debug.', {detail: 'Reload the window (with Ctrl+Shift+F5 e.g.) to let the changes take effect.'});
+        atom.notifications.addInfo('Enabled timings debug.', {detail: 'Reload the window (Ctrl+Shift+F5) to let the changes take effect.'});
       }
     } else {
       atom.notifications.addWarning('Cannot toggle debug mode since it is disabled.', null);
@@ -110,10 +110,10 @@ export default {
     if(window.localStorage.getItem('snippet-injector-debug') === 'true') {
       if(window.localStorage.getItem('snippet-injector-debug-objl') === 'true') {
         window.localStorage.setItem('snippet-injector-debug-objl',false.toString());
-        atom.notifications.addInfo('Disabled object debug.', {detail: 'Reload the window (with Ctrl+Shift+F5 e.g.) to let the changes take effect.'});
+        atom.notifications.addInfo('Disabled object debug.', {detail: 'Reload the window (Ctrl+Shift+F5) to let the changes take effect.'});
       } else {
         window.localStorage.setItem('snippet-injector-debug-objl',true.toString());
-        atom.notifications.addInfo('Enabled object debug.', {detail: 'Reload the window (with Ctrl+Shift+F5 e.g.) to let the changes take effect.'});
+        atom.notifications.addInfo('Enabled object debug.', {detail: 'Reload the window (Ctrl+Shift+F5) to let the changes take effect.'});
       }
     } else {
       atom.notifications.addWarning('Cannot toggle debug mode since it is disabled.', null);
@@ -127,14 +127,6 @@ export default {
     var selection = atom.workspace.getActiveTextEditor().getSelectedText();
     var grammar = atom.workspace.getActiveTextEditor().getGrammar().name;
     var storage = this.storage;
-    var uid = Util.generateUID({
-      unique: true,
-      tester: storage.testFile,
-      timeout: 100,
-      length: 20,
-      prefix: 'sn',
-      insertstring: 'SNIPPET'
-    });
     const inputPrompt = Util.promptUser({
       placeholder: 'Enter snippet title',
       btnconfirm: 'Save snippet',
@@ -143,10 +135,9 @@ export default {
       if(Util.isset(text,'string')) {
         var result = storage.store(new Snippet({
           title: text,
-          tags: new Array(),
           content: selection,
           lang: grammar,
-          uid: uid
+          version: Util.getPackageVersion()
         }));
         if(result) {
           atom.notifications.addSuccess('Snippet "'+text+'" was saved successfully.', null);

lib/externals/jquery-3.2.1.min.js

@@ -1,15 +1,25 @@
 'use babel';
 
 import Util from './util.js';
+import Storage from './storage.js';
 const os = require('os');
 
+const lastUpdate = '1.1.8';
+
 export default class Snippet {
 
   content = '';
   title = '';
   tags = new Array();
   lang = '';
-  uid = Date.now().toString();
+  uid = Util.generateUID({
+    unique: true,
+    tester: Storage.testFile,
+    timeout: 100,
+    length: 20,
+    prefix: 'sn',
+    insertstring: 'SNIPPET'
+  });
   version = undefined;
   author = os.userInfo().username;
 
@@ -111,4 +121,8 @@ export default class Snippet {
   setAuthor(newauthor) {
     this.author = newauthor;
   }
+
+  static getLastUpdate() {
+    return lastUpdate;
+  }
 }

lib/icon-helper.js

@@ -5,8 +5,6 @@ import Snippet from './snippet.js';
 import Util from './util.js';
 const fs = require('fs');
 
-const lastSnippetUpdate = '1.1.8';
-
 export default class Storage {
 
   dir = '';
@@ -115,7 +113,7 @@ export default class Storage {
     }
   }
 
-  testFile(uid) {
+  static testFile(uid) {
     if(this.dir === '') {
       throw new TypeError('Storage directory has not been initialized.');
     } else {
@@ -175,8 +173,8 @@ export default class Storage {
           _this.backup(current);
 
           var snippet = new Snippet(JSON.parse(_this.retrieveFile(current)));
-          var res = Util.compareVersions(lastSnippetUpdate,snippet.getVersion());
-          if(res === lastSnippetUpdate || res === undefined) {
+          var res = Util.compareVersions(Snippet.getLastUpdate(),snippet.getVersion());
+          if(res === Snippet.getLastUpdate() || res === undefined) {
             snippet.setVersion(Util.getPackageVersion());
             snippet.setUID(Util.generateUID({
               unique: true,

lib/snippet-injector.js

@@ -4,7 +4,7 @@ import { TextEditor } from 'atom';
 import IconHelper from './icon-helper.js';
 const fs = require('fs');
 const path = require('path');
-const $ = require('jquery');
+const $ = require('./externals/jquery-3.2.1.min.js');
 
 export default class Util {
 

lib/snippet.js

@@ -9,7 +9,5 @@
   "engines": {
     "atom": ">=1.0.0 <2.0.0"
   },
-  "dependencies": {
-    "jquery": "^3.2.1"
-  }
+  "dependencies": {}
 }