code cleanup and fixes

kippt · Aug 29, 2012 · e25234c · e25234c
1 parent 239ea90
commit e25234c
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 40 deletions.
diff --git a/data/blank.html b/data/blank.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+<head>
+<style>
+  body { margin:0; background-color: #fff; text-align: center; }
+  img  { margin: 50px auto; }
+</style>
+</head>
+<body>
+  <img src="spinner.gif" alt="" />
+</body>
+</html>
diff --git a/data/spinner.gif b/data/spinner.gif
diff --git a/lib/main.js b/lib/main.js
@@ -1,48 +1,41 @@
-exports.main = function() {
-    var currentUrl = '';
-    var currentTitle = '';
-    var currentSelection = '';
-
-    var self = require("self");
-
-    var selection = require("selection");
+var self = require("self");
+var selection = require("selection");
+var tabs = require("tabs");
+var widget = require('widget').Widget;
+var panel = require('panel').Panel;
 
-    var selectedText = '';
+exports.main = function() {
+    var selectedText = {text: '', tabUrl: null};
 
     function selectionChanged(event){
-        selectedText = selection.text;
+        selectedText.text = selection.text;
+        selectedText.tabUrl = tabs.activeTab.url;
     }
 
     selection.on('select', selectionChanged);
 
-    // Create widget that will show panel on click
-    require("widget").Widget({
-        id: "kippt",
-        label: "Kippt it",
-        contentURL: self.data.url("icon.png"),
-        onClick: function(){
-            var tabs = require("tabs");
-            var currentUrl = tabs.activeTab.url;
-            var currentTitle = tabs.activeTab.title;
-            if (!selectedText) selectedText = '';
-
-            // Create panel for kippt
-            var kipptPanel = require("panel").Panel({
-                width:420,
-                height:245,
-                contentURL : "https://kippt.com/extensions/new/?"
-                            +"url="+encodeURIComponent(currentUrl)
-                            +"&title="+encodeURIComponent(currentTitle)
-                            +"&notes="+encodeURIComponent(selectedText)
-                            +"&source=firefox",
-                contentScript: "setInterval(function(){ if (document.getElementById('submit_clip').value === 'Saved!') { setTimeout(function() { self.port.emit('close', null);}, 700); }}, 500);"
-            });
-            kipptPanel.port.on("close", function () {
-                kipptPanel.destroy();
-            });
-
-            kipptPanel.show();
-        }
+
+    var kipptPanel = panel({
+        width: 450,
+        height: 240,
+        contentURL : self.data.url('blank.html'),
+        onHide: function(){ kipptPanel.contentURL = self.data.url('blank.html'); }
     });
-
-};
+
+    widget({
+       id: 'kippt',
+       label: 'Kippt it',
+       contentURL: self.data.url("icon.png"),
+       panel: kipptPanel,
+       onClick: function(){
+        var text = tabs.activeTab.url == selectedText.tabUrl ? selectedText.text : '';
+
+        kipptPanel.contentURL = "https://kippt.com/extensions/new/?"
+                                + "url="     + encodeURIComponent(tabs.activeTab.url)
+                                + "&title="  + encodeURIComponent(tabs.activeTab.title)
+                                + "&notes="  + encodeURIComponent(text)
+                                + "&source=firefox";
+       }
+    });
+
+};