Fix write add functionality breaking web version.

docs/logic/add.js

@@ -1,294 +1,297 @@
-const { ipcRenderer } = nodeRequire('electron');
+if (window.showAdd != undefined && window.showAdd)
-
-function Add()
 {
-  this.overlay = null;
+  const { ipcRenderer } = nodeRequire('electron');
-  this.display = null;
-  this.grid = null;
 
-  this.elementList = [];
+  function Add()
-  this.keys = null;
-  var parent = this;
-
-  // STATE
-  this.enabledOverlay = false;
-  this.addedTitle = false
-  this.addedDate = false
-  this.addedPerson = false
-  this.addedSource = false
-  this.addedProject = false
-  this.addedType = false
-  this.addedLink = false
-  this.addedTags = false
-  this.addedNote = false
-  this.addedQuote = false
-  this.addedTerms = false
-  this.addedProgress = false
-
-  this.install = function()
   {
-    this.grid = document.getElementById("grid");
+    this.overlay = null;
-    this.overlay = document.getElementById("overlay");
+    this.display = null;
+    this.grid = null;
 
-    this.setupElement('Title', 'TITLE', 'upper');
+    this.elementList = [];
-    this.setupElement('Date', 'DATE', 'lower');
+    this.keys = null;
-    this.setupElement('Type', 'TYPE', 'lower');
+    var parent = this;
-    this.setupElement('Link', 'LINK', 'url');
-    this.setupElement('Person', 'PERS', 'text');
-    this.setupElement('Source', 'SRCE', 'title');
-    this.setupElement('Project', 'PROJ', 'text');
-    this.setupElement('Tags', 'TAGS', 'tags');
-    this.setupElement('Progress', 'PROG', 'text');
-    this.setupElement('Note', 'NOTE', 'text'); // long
-    this.setupElement('Quote', 'QOTE', 'quote'); // long
-    this.setupElement('Terms', 'TERM', 'quote'); // long
-    // DONE
-    // REVI
-    this.keys = Object.keys(this.elementList);
 
-    // SETUP
+    // STATE
-    this.overlay.innerHTML = '';
+    this.enabledOverlay = false;
-    let content = `<div class="content">`
+    this.addedTitle = false
+    this.addedDate = false
+    this.addedPerson = false
+    this.addedSource = false
+    this.addedProject = false
+    this.addedType = false
+    this.addedLink = false
+    this.addedTags = false
+    this.addedNote = false
+    this.addedQuote = false
+    this.addedTerms = false
+    this.addedProgress = false
 
-    // ESCAPE
+    this.install = function()
-    content += `<div class="content-menu">`;
-    content += `<a href="javascript:void(0);" id="escape">`;
-    content += `<div class="content-menu-option">`;
-    content += `<b>Esc</b>`;
-    content += `</div>`;
-    content += `</a>`;
-    content += `</div>`;
-
-    // FORM
-    content += `<form>`;
-    for (var i = 0; i < this.keys.length; i++)
     {
-      content += `<div class="row">
+      this.grid = document.getElementById("grid");
-                    <div class="key" id="key${this.elementList[this.keys[i]].key}">${this.elementList[this.keys[i]].desc}</div>
+      this.overlay = document.getElementById("overlay");
-                    <input placeholder="${this.elementList[this.keys[i]].key}" id="${this.elementList[this.keys[i]].key}">
+        
-                  </div>`;
+      this.setupElement('Title', 'TITLE', 'upper');
+      this.setupElement('Date', 'DATE', 'lower');
+      this.setupElement('Type', 'TYPE', 'lower');
+      this.setupElement('Link', 'LINK', 'url');
+      this.setupElement('Person', 'PERS', 'text');
+      this.setupElement('Source', 'SRCE', 'title');
+      this.setupElement('Project', 'PROJ', 'text');
+      this.setupElement('Tags', 'TAGS', 'tags');
+      this.setupElement('Progress', 'PROG', 'text');
+      this.setupElement('Note', 'NOTE', 'text'); // long
+      this.setupElement('Quote', 'QOTE', 'quote'); // long
+      this.setupElement('Terms', 'TERM', 'quote'); // long
+      // DONE
+      // REVI
+      this.keys = Object.keys(this.elementList);
+
+      // SETUP
+      this.overlay.innerHTML = '';
+      let content = `<div class="content">`
+
+      // ESCAPE
+      content += `<div class="content-menu">`;
+      content += `<a href="javascript:void(0);" id="escape">`;
+      content += `<div class="content-menu-option">`;
+      content += `<b>Esc</b>`;
+      content += `</div>`;
+      content += `</a>`;
+      content += `</div>`;
+
+      // FORM
+      content += `<form>`;
+      for (var i = 0; i < this.keys.length; i++)
+      {
+        content += `<div class="row">
+                      <div class="key" id="key${this.elementList[this.keys[i]].key}">${this.elementList[this.keys[i]].desc}</div>
+                      <input placeholder="${this.elementList[this.keys[i]].key}" id="${this.elementList[this.keys[i]].key}">
+                    </div>`;
+      }
+      content += `</form>`;
+
+      // DISPLAY
+      content += `<div class="display" id="display">`;
+      content += `</div>`;
+
+      // ENTER
+      content += `<div class="content-enter">`;
+      content += `<a href="javascript:void(0);" id="enter">`;
+      content += `<div class="content-menu-option">`;
+      content += `<b>Enter</b>`;
+      content += `</div>`;
+      content += `</a>`;
+      content += `</div>`;
+      
+      content += `</div>`;
+
+      this.overlay.innerHTML += content;
+
+      this.display = document.getElementById("display");
+
+      document.getElementById("enter").addEventListener('click', 
+      () => 
+      {
+        console.log('called write');
+        let content = this.display.innerHTML.replace(/\s?(<br\s?\/?>)\s?/g, "\r\n"); // replace line breaks
+        content = content.replace(/&nbsp;/g, ' '); // replace tabs/spaces
+        // var content = content.replace(/\u00a0/g, ' ');
+        ipcRenderer.send('write', "\r\n" + "\r\n" + content);
+      });
+
+      for (var i = 0; i < this.keys.length; i++)
+      {
+        this.elementList[this.keys[i]].elem = document.getElementById(this.elementList[this.keys[i]].key);
+        this.elementList[this.keys[i]].elem.oninput = this.onElemChanged;
+        this.elementList[this.keys[i]].elem.onfocus = this.onElemFocus;
+        this.elementList[this.keys[i]].elem.onblur = this.onElemBlur;
+        this.elementList[this.keys[i]].elemKey = document.getElementById("key" + this.elementList[this.keys[i]].key);
+      }
+      setTimeout(function()
+      { 
+        parent.setupData();
+      }, 100);
     }
-    content += `</form>`;
 
-    // DISPLAY
+    this.setupElement = function(key, desc, type)
-    content += `<div class="display" id="display">`;
-    content += `</div>`;
-
-    // ENTER
-    content += `<div class="content-enter">`;
-    content += `<a href="javascript:void(0);" id="enter">`;
-    content += `<div class="content-menu-option">`;
-    content += `<b>Enter</b>`;
-    content += `</div>`;
-    content += `</a>`;
-    content += `</div>`;
-    
-    content += `</div>`;
-
-    this.overlay.innerHTML += content;
-
-    this.display = document.getElementById("display");
-
-    document.getElementById("enter").addEventListener('click', 
-    () => 
     {
-      console.log('called write');
+      this.elementList[key] = { key: key, desc: desc, type: type, added: false};
-      let content = this.display.innerHTML.replace(/\s?(<br\s?\/?>)\s?/g, "\r\n"); // replace line breaks
-      content = content.replace(/&nbsp;/g, ' '); // replace tabs/spaces
-      // var content = content.replace(/\u00a0/g, ' ');
-      ipcRenderer.send('write', "\r\n" + "\r\n" + content);
-    });
-
-    for (var i = 0; i < this.keys.length; i++)
-    {
-      this.elementList[this.keys[i]].elem = document.getElementById(this.elementList[this.keys[i]].key);
-      this.elementList[this.keys[i]].elem.oninput = this.onElemChanged;
-      this.elementList[this.keys[i]].elem.onfocus = this.onElemFocus;
-      this.elementList[this.keys[i]].elem.onblur = this.onElemBlur;
-      this.elementList[this.keys[i]].elemKey = document.getElementById("key" + this.elementList[this.keys[i]].key);
     }
-    setTimeout(function()
+
+    this.onElemChanged = function(e)
     {
+      // TODO: Autocomplete tags, type 
       parent.setupData();
-    }, 100);
-  }
-
-  this.setupElement = function(key, desc, type)
-  {
-    this.elementList[key] = { key: key, desc: desc, type: type, added: false};
-  }
-
-  this.onElemChanged = function(e)
-  {
-    // TODO: Autocomplete tags, type 
-    parent.setupData();
-  }
-
-  this.onElemFocus = function(e)
-  {
-    for (var i = 0; i < parent.keys.length; i++)
-    {
-      if (e.target.id == parent.elementList[parent.keys[i]].key)
-      {
-        if (!parent.elementList[parent.keys[i]].added)
-        {
-          parent.elementList[parent.keys[i]].added = true;
-          parent.elementList[parent.keys[i]].elemKey.style.visibility = "visible";
-        }
-        break;
-      }
     }
-  }
 
-  this.onElemBlur = function(e)
+    this.onElemFocus = function(e)
-  {
-    for (var i = 0; i < parent.keys.length; i++)
     {
-      if (e.target.id == parent.elementList[parent.keys[i]].key)
+      for (var i = 0; i < parent.keys.length; i++)
       {
-        if (parent.elementList[parent.keys[i]].elem.value == '' && parent.elementList[parent.keys[i]].added)
+        if (e.target.id == parent.elementList[parent.keys[i]].key)
         {
-          parent.elementList[parent.keys[i]].added = false;
+          if (!parent.elementList[parent.keys[i]].added)
-          parent.elementList[parent.keys[i]].elemKey.style.visibility = "hidden";
+          {
-        }
+            parent.elementList[parent.keys[i]].added = true;
-        break;
+            parent.elementList[parent.keys[i]].elemKey.style.visibility = "visible";
-      }
+          }
-    }
+          break;
-  }
-
-  this.setupData = function()
-  {
-    let value = '';
-    for (var i = 0; i < parent.keys.length; i++)
-    {
-      if (parent.elementList[parent.keys[i]].key == 'Title')
-      {
-        if (parent.elementList[parent.keys[i]].elem.value != '')
-        {
-          value += parent.elementList[parent.keys[i]].elem.value.toUpperCase();
-        }
-        else
-        {
-          value += 'TITLE';
-        }
-      }
-      else if (parent.elementList[parent.keys[i]].elem.value != '')
-      {
-        value += '<br>';
-        value += '&nbsp;&nbsp;';
-        value += parent.elementList[parent.keys[i]].desc.toUpperCase() + ' : ';
-
-        if (parent.elementList[parent.keys[i]].type == 'lower')
-        {
-          value += parent.elementList[parent.keys[i]].elem.value.toLowerCase();
-        }
-        else if (parent.elementList[parent.keys[i]].type == 'text')
-        {
-          value += parent.elementList[parent.keys[i]].elem.value;
-        }
-        else if (parent.elementList[parent.keys[i]].type == 'url')
-        {
-          // TODO: validate
-          value += parent.elementList[parent.keys[i]].elem.value;
-        }
-        else if (parent.elementList[parent.keys[i]].type == 'tags')
-        {
-          // TODO: Format
-          value += parent.elementList[parent.keys[i]].elem.value;
-        }
-        else if (parent.elementList[parent.keys[i]].type == 'quote')
-        {
-          // TODO: Format
-          value += parent.elementList[parent.keys[i]].elem.value;
-        }
-        else if (parent.elementList[parent.keys[i]].type == 'title')
-        {
-          value += parent.elementList[parent.keys[i]].elem.value.toProperCase();
-        }
-        else if (parent.elementList[parent.keys[i]].type == 'upper')
-        {
-          value += parent.elementList[parent.keys[i]].elem.value.toLowerCase();
         }
       }
     }
-    parent.display.innerHTML = value;
-  }
 
-  this.show = function()
+    this.onElemBlur = function(e)
-  {
-    this.setOverlay(true);
-
-    var date = new Date();
-    var dateString = "1" + date.getFullYear()
-                    + "-" + ("0"+(date.getMonth()+1)).slice(-2) 
-                    + "-" + ("0" + date.getDate()).slice(-2);
-    this.elementList['Date'].elem.value = dateString;
-    this.elementList['Date'].added = true;
-    this.elementList['Date'].elemKey.style.visibility = "visible";
-
-    setTimeout(function()
     {
-      parent.elementList['Title'].elem.focus();
+      for (var i = 0; i < parent.keys.length; i++)
-    }, 100);
+      {
-  }
+        if (e.target.id == parent.elementList[parent.keys[i]].key)
+        {
+          if (parent.elementList[parent.keys[i]].elem.value == '' && parent.elementList[parent.keys[i]].added)
+          {
+            parent.elementList[parent.keys[i]].added = false;
+            parent.elementList[parent.keys[i]].elemKey.style.visibility = "hidden";
+          }
+          break;
+        }
+      }
+    }
 
-  this.setOverlay = function(value)
+    this.setupData = function()
-  {
-    if (value && !this.enabledOverlay)
     {
-      overlay.style.opacity = '1';
+      let value = '';
-      overlay.style.zIndex  = '1000';
+      for (var i = 0; i < parent.keys.length; i++)
-      this.enabledOverlay = true;
+      {
+        if (parent.elementList[parent.keys[i]].key == 'Title')
+        {
+          if (parent.elementList[parent.keys[i]].elem.value != '')
+          {
+            value += parent.elementList[parent.keys[i]].elem.value.toUpperCase();
+          }
+          else
+          {
+            value += 'TITLE';
+          }
+        }
+        else if (parent.elementList[parent.keys[i]].elem.value != '')
+        {
+          value += '<br>';
+          value += '&nbsp;&nbsp;';
+          value += parent.elementList[parent.keys[i]].desc.toUpperCase() + ' : ';
+
+          if (parent.elementList[parent.keys[i]].type == 'lower')
+          {
+            value += parent.elementList[parent.keys[i]].elem.value.toLowerCase();
+          }
+          else if (parent.elementList[parent.keys[i]].type == 'text')
+          {
+            value += parent.elementList[parent.keys[i]].elem.value;
+          }
+          else if (parent.elementList[parent.keys[i]].type == 'url')
+          {
+            // TODO: validate
+            value += parent.elementList[parent.keys[i]].elem.value;
+          }
+          else if (parent.elementList[parent.keys[i]].type == 'tags')
+          {
+            // TODO: Format
+            value += parent.elementList[parent.keys[i]].elem.value;
+          }
+          else if (parent.elementList[parent.keys[i]].type == 'quote')
+          {
+            // TODO: Format
+            value += parent.elementList[parent.keys[i]].elem.value;
+          }
+          else if (parent.elementList[parent.keys[i]].type == 'title')
+          {
+            value += parent.elementList[parent.keys[i]].elem.value.toProperCase();
+          }
+          else if (parent.elementList[parent.keys[i]].type == 'upper')
+          {
+            value += parent.elementList[parent.keys[i]].elem.value.toLowerCase();
+          }
+        }
+      }
+      parent.display.innerHTML = value;
+    }
+
+    this.show = function()
+    {
+      this.setOverlay(true);
+
+      var date = new Date();
+      var dateString = "1" + date.getFullYear()
+                      + "-" + ("0"+(date.getMonth()+1)).slice(-2) 
+                      + "-" + ("0" + date.getDate()).slice(-2);
+      this.elementList['Date'].elem.value = dateString;
+      this.elementList['Date'].added = true;
+      this.elementList['Date'].elemKey.style.visibility = "visible";
+
       setTimeout(function()
       { 
-        this.grid.innerHTML = '';
+        parent.elementList['Title'].elem.focus();
-        this.grid.style.height = 0;
+      }, 100);
-      }, 200);
     }
-    else if (!value && this.enabledOverlay)
+
+    this.setOverlay = function(value)
     {
-      overlay.style.opacity = '0';
+      if (value && !this.enabledOverlay)
-      setTimeout(function()
       {
-        overlay.style.zIndex  = '-100';
+        overlay.style.opacity = '1';
-      }, 200);
+        overlay.style.zIndex  = '1000';
-      this.enabledOverlay = false;
+        this.enabledOverlay = true;
+        setTimeout(function()
+        {
+          this.grid.innerHTML = '';
+          this.grid.style.height = 0;
+        }, 200);
+      }
+      else if (!value && this.enabledOverlay)
+      {
+        overlay.style.opacity = '0';
+        setTimeout(function()
+        {
+          overlay.style.zIndex  = '-100';
+        }, 200);
+        this.enabledOverlay = false;
+      }
     }
   }
+
+  String.prototype.toProperCase = function () {
+      return this.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
+  };
+
+  document.onkeydown = function(evt) 
+  {
+    evt = evt || window.event;
+    if (!evt.ctrlKey)
+    {
+      var isEscape = false;
+      var isA = false;
+      
+      if ("key" in evt)
+      {
+        isEscape = (evt.key == "Escape" || evt.key == "Esc");
+      }
+      else
+      {
+        isEscape = (evt.keyCode == 27);
+      }
+      isA = (evt.keyCode == 65);
+      
+      if (isEscape)
+      {
+        if (main.queryCur == 'add')
+        {
+          main.load(main.queryPrev);
+        }
+      }
+      else if (isA && main.queryCur != 'add')
+      {
+        main.load('add');
+      }
+    }
+  };
 }
-
-String.prototype.toProperCase = function () {
-    return this.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
-};
-
-document.onkeydown = function(evt) 
-{
-  evt = evt || window.event;
-  if (!evt.ctrlKey)
-  {
-    var isEscape = false;
-    var isA = false;
-    
-    if ("key" in evt)
-    {
-      isEscape = (evt.key == "Escape" || evt.key == "Esc");
-    }
-    else
-    {
-      isEscape = (evt.keyCode == 27);
-    }
-    isA = (evt.keyCode == 65);
-    
-    if (isEscape)
-    {
-      if (main.queryCur == 'add')
-      {
-        main.load(main.queryPrev);
-      }
-    }
-    else if (isA && main.queryCur != 'add')
-    {
-      main.load('add');
-    }
-  }
-};

docs/logic/main.js

@@ -13,7 +13,8 @@ function Main()
   {
     var client = new XMLHttpRequest();
     client.open('GET', FILELOCATION);
-    client.onreadystatechange = function() 
+    client.overrideMimeType("text/plain");
+    client.onreadystatechange = function(req, res) 
     {
       if (client.responseText.trim() != '')
       {
@@ -30,13 +31,16 @@ function Main()
     this.db.install(data);
     this.view = new View();
     this.view.install();
-    this.add = new Add();
-    this.add.install();
 
-    var escape = document.getElementById("escape");
+    if (window.showAdd != undefined && window.showAdd)
-    escape.onclick = function()
     {
-      main.load(main.queryPrev);
+      this.add = new Add();
+      this.add.install();
+      var escape = document.getElementById("escape");
+      escape.onclick = function()
+      {
+        main.load(main.queryPrev);
+      }
     }
 
     this.start();

docs/logic/view.js

@@ -49,7 +49,10 @@ function View()
 
   this.display = function(db)
   {
-    main.add.setOverlay(false);
+    if (window.showAdd != undefined && window.showAdd)
+    {
+      main.add.setOverlay(false);
+    }
 
     // BUILD
     this.grid.innerHTML = '';

preload.js

@@ -2,3 +2,5 @@ window.nodeRequire = require;
 delete window.require;
 delete window.exports;
 delete window.module;
+
+// window.showAdd = true;