locatine 0.01546 → 0.01659

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a4b678e1915017d1898771afe9cd2b737051b62
-  data.tar.gz: 8adbe3846eecb369e49483a1aa2e08b291dddf6c
+  metadata.gz: 9be6c3fbe4cec2f39899f6874683c8653b12d756
+  data.tar.gz: 1c00862aa6032251a4f7a14f4a80a02e68d1be3e
 SHA512:
-  metadata.gz: f79005a1036bbe968439219a2b3c90ec183b95d4ae7990cebdee2aa9065186a93dcb96c592dd5dd894a1b1f633eb20d9e5ee604206c8c6ef88296eb2a936a531
-  data.tar.gz: 53b87536a961b56ec9b82a2762812dfd151b7454b716eb108137f97fa8d71e751fca8c564c6da414c0f8d68c5784a69d0c2d4853e9a477d2b248a7b9f5497560
+  metadata.gz: bc1289f818358b5a05789676cff4384f24ca3494cfafbbed95a64e04cf0a172b841490f267f93d7ba6db8e9ea72e4081c96d4b1bda184d6da02ce067d55b46fd
+  data.tar.gz: 12d72cb6cb38cac62e74c9c7ee38eaec0586cf93ab1997e70e8d0cf4608fe95aa05baf53a32c694f0d367aafd3925a1fc43a9635d3df24b87dd19bfc3c4d615f

data/lib/locatine/app/content.js

@@ -9,50 +9,60 @@ async function get_value(name) {
   return x[name];
 };
 
-document.addEventListener("locatine_send", async function(e) {
-  await set_value(e.detail.varname, e.detail.varvalue);
-});
+async function creatingDiv(){
+  const options = {
+    "id":"locatine_magic_div",
+    "locatinestyle": await get_value('magic_div') || "false",
+    "locatinetitle": "ok",
+    "locatinehint": "ok"
+  };
+  locatine_create_element(document.body, "div", options, "");
+  const magic_cover = document.getElementById('locatine_magic_div');
+  magic_cover.onclick = function(e) {locatine_magic_click(e)};
+}
+
+async function setStyle(style, magicDiv){
+  if (style === "set_true") {
+    await set_value('magic_div', true);
+    magicDiv.setAttribute("locatinestyle", "true");
+  };
+  if (style === "set_false") {
+    await set_value('magic_div', false);
+    magicDiv.setAttribute("locatinestyle", "false");
+  };
+  let status = await get_value('magic_div');
+  magicDiv.setAttribute("locatinestyle", status);
+}
+
+async function setTitleHint(magicDiv){
+  if (magicDiv.getAttribute("locatinetitle") != "ok") {
+    await set_value('locatine_title', magicDiv.getAttribute("locatinetitle"));
+    await set_value('locatine_hint', magicDiv.getAttribute("locatinehint"));
+    magicDiv.setAttribute("locatinetitle", "ok");
+  }
+}
+
+async function setConfirm(magicDiv) {
+  if (magicDiv.getAttribute("locatineconfirmed") === "ok") {
+    magicDiv.removeAttribute("tag");
+    magicDiv.removeAttribute("index");
+    await set_value("locatine_confirm", false);
+  }
+
+  const confirmed = await get_value('locatine_confirm');
+  magicDiv.setAttribute("locatineconfirmed", confirmed);
+}
 
 async function refreshData(){
+  const magicDiv = document.getElementById("locatine_magic_div");
   if (!document.getElementById("locatine_magic_div")){
-    const options = {
-      "locatineclass": "locatine_smthing",
-      "id":"locatine_magic_div",
-      "locatinestyle": await get_value('magic_div') || "false",
-      "locatinetitle": "ok",
-      "locatinehint": "ok"
-    };
-    locatine_create_element(document.body, "div", options, "");
+    creatingDiv();
   } else {
-    const magicDiv = document.getElementById("locatine_magic_div");
-    if (magicDiv.getAttribute("locatinestyle") === "set_true") {
-      await set_value('magic_div', true);
-      magicDiv.setAttribute("locatinestyle", "true");
-    };
-    if (magicDiv.getAttribute("locatinestyle") === "set_false") {
-      await set_value('magic_div', false);
-      magicDiv.setAttribute("locatinestyle", "false");
-    };
-    if (magicDiv.getAttribute("locatinetitle") != "ok") {
-      await set_value('locatine_title', magicDiv.getAttribute("locatinetitle"));
-      await set_value('locatine_hint', magicDiv.getAttribute("locatinehint"));
-      magicDiv.setAttribute("locatinetitle", "ok");
-    }
-    let status = await get_value('magic_div');
-    if (magicDiv.getAttribute("locatinestyle") != "set_true"){
-      magicDiv.setAttribute("locatinestyle", status);
-    }
-    magicDiv.setAttribute("locatinecollection", await get_value("locatine_collection"))
-    if (magicDiv.getAttribute("locatineconfirmed") === "ok") {
-      magicDiv.removeAttribute("tag");
-      magicDiv.removeAttribute("index");
-      await set_value("locatine_confirm", false);
-    }
-    const confirmed = await get_value('locatine_confirm');
-    magicDiv.setAttribute("locatineconfirmed", confirmed);
+    setStyle(magicDiv.getAttribute("locatinestyle"), magicDiv);
+    setTitleHint(magicDiv);
+    magicDiv.setAttribute("locatinecollection", await get_value("locatine_collection"));
+    setConfirm(magicDiv);
   };
-  const magic_cover = document.getElementById('locatine_magic_div');
-  magic_cover.onclick = function(e) {locatine_magic_click(e)};
 };
 
 async function getSelected(value){
@@ -78,8 +88,8 @@ async function locatine_magic_click(e) {
   const array = Array.prototype.slice.call( document.getElementsByTagName(tagName) );
   const index = array.indexOf(value);
   await set_value("locatine_confirm", "selected");
-  document.getElementById("locatine_magic_div").setAttribute("TAG", tagName);
-  document.getElementById("locatine_magic_div").setAttribute("INDEX", index);
+  document.getElementById("locatine_magic_div").setAttribute("tag", tagName);
+  document.getElementById("locatine_magic_div").setAttribute("index", index);
 };
 
 function locatine_create_element(dom, tag, attrs, inner) {
@@ -92,8 +102,6 @@ function locatine_create_element(dom, tag, attrs, inner) {
   return element;
 };
 
-//set_value('magic_div','off');
-
 setInterval(async function(){
   if (document.getElementById("locatine_magic_div")) {
     if (document.getElementById("locatine_magic_div").getAttribute("locatinestyle") != "blocked") {

data/lib/locatine/app/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "Locatine app",
-  "version": "0.01546",
+  "version": "0.01659",
   "description": "Messaging from browser to main app",
   "devtools_page": "devtools.html",
   "permissions": ["activeTab", "storage", "contextMenus", "tabs"],

data/lib/locatine/data_generate.rb

@@ -85,7 +85,7 @@ module Locatine
       attributes = element.attributes
       array = []
       attributes.each_pair do |name, value|
-        next if name.to_s == 'locatineclass'
+        next if name.to_s == 'locatineclass' # Should never happen
 
         value.split(/['" ]/).reject(&:empty?).uniq.each do |part|
           array.push('name' => name.to_s, 'type' => 'attribute',

data/lib/locatine/dialog_logic.rb

@@ -82,17 +82,25 @@ module Locatine
       return nil, {}
     end
 
+    def user_selection(els, attrs, vars, name, scope)
+      case get_from_app('locatineconfirmed')
+      when 'selected'
+        els, attrs = what_was_selected(els, attrs, vars, name, scope)
+      when 'declined'
+        els, attrs = decline(els, name, scope)
+      end
+      return els, attrs
+    end
+
     def listening(els, attrs, vars, name, scope)
       until get_from_app('locatineconfirmed') == 'true'
         sleep(0.1)
-        case get_from_app('locatineconfirmed')
-        when 'selected'
-          els, attrs = what_was_selected(els, attrs, vars, name, scope)
-        when 'declined'
-          els, attrs = decline(els, name, scope)
-        end
+        els, attrs = user_selection(els, attrs, vars, name, scope)
       end
-      return els, attrs
+      return els, attrs if els
+
+      decline(els, name, scope)
+      listening(els, attrs, vars, name, scope)
     end
 
     ##

data/lib/locatine/version.rb

@@ -1,6 +1,6 @@
 module Locatine
   # constants here...
-  VERSION = '0.01546'.freeze
+  VERSION = '0.01659'.freeze
   NAME = 'locatine'.freeze
   HOME = if File.readable?("#{Dir.pwd}/lib/#{Locatine::NAME}")
            "#{Dir.pwd}/lib/#{Locatine::NAME}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locatine
 version: !ruby/object:Gem::Version
-  version: '0.01546'
+  version: '0.01659'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler