X-Git-Url: https://git.ktnx.net/?p=icedeb.git;a=blobdiff_plain;f=icedeb.js;h=0d42d9c949d274f315d9fc9b3fc82adfc38875aa;hp=8c2a7e66080d64372bb16f47933583f70fb6b05b;hb=c49403e902b0e3b74281f6b86bd5cb666c1b314a;hpb=8b4cc4bb03e6fdd909226a01d0ef3332c1256d5f

diff --git a/icedeb.js b/icedeb.js
index 8c2a7e6..0d42d9c 100644
--- a/icedeb.js
+++ b/icedeb.js
@@ -36,57 +36,90 @@ 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);
+        }
+      );
+  });
 }
 
 function open_link(url, in_new_tab) {
+  //console.log('open_link', url, in_new_tab);
+
   if (in_new_tab) {
-    open_tab(url);
-    return;
+    return open_tab(url);
   }
 
-  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} );
-            },
-            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);
-      }
-    );
+  //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) {
-  if (e.target.tagName == 'a') {
-    open_link(e.target.href, e.button == 1);
+  //console.log(e.target.tagName);
+  let autoclose = true;
+
+  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;
   }
 
-  if ( !e.target.classList.contains('icedeb-button') )
-    return;
-
-  let autoclose = true;
-
   let clip_input = document.getElementById("clipboard");
   let clip = trim(clip_input.value);
 
-  console.log(clip);
+  if(clip_input.value == '') return;
 
   let url;
 
@@ -108,6 +141,9 @@ function link_clicked(e) {
       if (clip != '')
         url += '?login=' + clip;
       break;
+    case 'dmd':
+      url = 'https://udd.debian.org/dmd.cgi?email1=' + clip;
+      break;
     case 'buildd':
       url = 'https://buildd.debian.org/' + clip;
       break;
@@ -118,12 +154,34 @@ function link_clicked(e) {
       break;
   }
 
-  open_link(url, e.button == 1);
-  if (autoclose) window.close();
+  open_link(url, e.button == 1)
+    .then( function() {
+      if (autoclose) {
+        //console.log('closing pop-up');
+        window.close();
+      }
+    });
+
+  e.preventDefault();
+  return false;
+}
+
+function get_clipboard_contents() {
+  let clip_pot = document.getElementById('clip-pot');
+  let clip_input = document.getElementById("clipboard");
+  clip_pot.focus();
+  if (document.execCommand("Paste")) {
+    clip_input.value = clip_pot.textContent.trim();
+    clip_input.focus();
+    clip_input.setSelectionRange(0, clip_input.value.length)
+  }
 }
 
-window.addEventListener('load', (e) => {
-  document.getElementById('button-list-container').addEventListener('click', link_clicked);
+window.addEventListener('DOMContentLoaded', (e) => {
+  document.querySelectorAll('.icedeb-button, #button-list-container a')
+    .forEach(function(el){
+      el.addEventListener('mouseup', link_clicked);
+    });
 
   document.addEventListener('change', (e) => {
     if ( !e.target.classList.contains('icedeb-option') )
@@ -132,11 +190,7 @@ window.addEventListener('load', (e) => {
     save_settings();
   });
 
-  let clip_input = document.getElementById("clipboard");
-  clip_input.focus();
-  if (!document.execCommand("paste")) {
-    let err = document.getElementById('error');
-    err.textContent = 'Error retrieving clipboard contents';
-    err.classList.remove('hidden');
-  }
+  window.requestAnimationFrame(()=>{
+    window.requestAnimationFrame(get_clipboard_contents);
+  });
 });