X-Git-Url: https://git.ktnx.net/?p=icedeb.git;a=blobdiff_plain;f=icedeb.js;h=9c9a77053aa597e6b418f69d5efd6c2306a92eb6;hp=dcd1197506839e86cebcd3920cb37f021f2a0fb2;hb=aee59ae1e856b0f51f4806fdadfdb6ecda01609e;hpb=770b99eb23ca37c131fd5497cb5d1ce22bfb1b8d

diff --git a/icedeb.js b/icedeb.js
index dcd1197..9c9a770 100644
--- a/icedeb.js
+++ b/icedeb.js
@@ -36,32 +36,92 @@ function trim(word) {
 }
 
 function open_tab(url) {
-  browser.tabs.create({url:url})
-    .then(
-      function() {},
-      function(err) {
-        console.log('Error creating tab', err);
-      }
-    );
+  return new Promise((resolve, reject) => {
+    browser.tabs.create({url:url, active:false})
+      .then(
+        function() {
+          resolve();
+        },
+        function(err) {
+          //console.log('Error creating tab', err);
+          reject(err);
+        }
+      );
+  });
 }
 
-document.addEventListener('click', (e) => {
-  console.log(e.button);
-  if ( !e.target.classList.contains('icedeb-button') )
-    return;
+function open_link(url, in_new_tab) {
+  //console.log('open_link', url, in_new_tab);
+
+  if (in_new_tab) {
+    return open_tab(url);
+  }
+
+  //console.log('querying active tab');
+  return new Promise((resolve, reject) => {
+    browser.tabs.query({active:true, currentWindow:true})
+      .then(
+        function(tabs) {
+          //console.log('active tab queried');
+          browser.tabs.executeScript(tabs[0].id, {file: '/icedeb-content.js'})
+            .then(
+              function(){
+                //console.log('content script executed');
+                browser.tabs.sendMessage( tabs[0].id, {url:url} )
+                  .then(
+                    function() {
+                      //console.log('message sent');
+                      resolve();
+                    },
+                    function(err) {
+                      console.log('error sending message', err);
+                      reject(err);
+                    }
+                  );
+              },
+              function(err){
+                console.log('Error executing script. Probably a system tab is active', err, tabs[0]);
+                open_tab(url)
+                  .then(
+                    function() { resolve(); },
+                    function(err) { reject(err); } );
+              });
+
+        },
+        function(err) {
+          console.log('Error querying the active tab of the current window', err);
+          open_tab(url)
+            .then(
+              function() { resolve(); },
+              function(err) { reject(err) }
+            );
+        }
+      );
+  });
+}
 
+function link_clicked(e) {
+  //console.log(e.target.tagName);
   let autoclose = true;
 
-  let clip_input = document.getElementById("clipboard");
-  clip_input.focus();
-  if (!document.execCommand("paste")) {
-    let err = document.getElementById('error');
-    err.textContent = 'Error executing Paste';
-    err.classList.remove('hidden');
-    return;
+  if (e.target.tagName == 'A') {
+    open_link(e.target.href, e.button == 1)
+      .then( function() {
+        if (autoclose) {
+          //console.log('closing pop-up');
+          window.close();
+        }
+      });
+    e.preventDefault();
+    return false;
   }
 
-  let clip = trim(clip_input.textContent);
+  let clip_input = document.getElementById("clipboard");
+  if(clip_input.value == '')
+    get_clipboard_contents();
+  let clip = trim(clip_input.value);
+
+  if(clip_input.value == '') return;
 
   let url;
 
@@ -93,49 +153,50 @@ document.addEventListener('click', (e) => {
       break;
   }
 
-  if (e.button == 1) {
-    open_tab(url);
-    if (autoclose) window.close();
-    return;
-  }
-
-  browser.tabs.query({active:true, currentWindow:true})
-    .then(
-      function(tabs) {
-        browser.tabs.executeScript(tabs[0].id, {file: '/icedeb-content.js'})
-          .then(
-            function(){
-              browser.tabs.sendMessage( tabs[0].id, {url:url} );
-              if (autoclose) window.close();
-            },
-            function(err){
-              console.log('Error executing script', err);
-            });
-
-      },
-      function(err) {
-        console.log('Error querying the active tab of the current window', err);
-        open_tab(url);
-        if (autoclose) window.close();
+  open_link(url, e.button == 1)
+    .then( function() {
+      if (autoclose) {
+        //console.log('closing pop-up');
+        window.close();
       }
-    );
-});
+    });
 
-document.addEventListener('change', (e) => {
-  if ( !e.target.classList.contains('icedeb-option') )
-    return;
+  e.preventDefault();
+  return false;
+}
 
-  save_settings();
-});
+function get_clipboard_contents() {
+  document.getElementById('error').classList.add('hidden');
+
+  let clip_pot = document.getElementById('clip-pot');
+  let clip_input = document.getElementById("clipboard");
+  clip_pot.focus();
+  if (!document.execCommand("Paste")) {
+    let err = document.getElementById('error');
+    err.textContent = 'Error retrieving clipboard contents';
+    err.classList.remove('hidden');
+  }
+  else {
+    clip_input.value = clip_pot.textContent.trim();
+    clip_input.focus();
+    clip_input.setSelectionRange(0, clip_input.value.length)
+  }
+}
 
-browser.runtime.getPlatformInfo()
-  .then(function(info) {
-    console.log(info.os);
+window.addEventListener('DOMContentLoaded', (e) => {
+  document.querySelectorAll('.icedeb-button, #button-list-container a')
+    .forEach(function(el){
+      el.addEventListener('mouseup', link_clicked);
+    });
 
-    switch (info.os) {
-      case 'linux':
-      case 'openbsd':
-        document.getElementById('sorry').classList.remove('hidden');
-        break;
-    }
+  document.addEventListener('change', (e) => {
+    if ( !e.target.classList.contains('icedeb-option') )
+      return;
+
+    save_settings();
   });
+
+  window.requestAnimationFrame(()=>{
+    window.requestAnimationFrame(get_clipboard_contents);
+  });
+});