1 files changed, 7 insertions, 7 deletions

diff --git a/pukka.js b/pukka.js
index 6987a72..bd16591 100644
--- a/pukka.js
+++ b/pukka.js
@@ -3,12 +3,12 @@
  * Add `pukka' http://codesorcery.net/pukka/ command to Bookmark del.icio.us
  * For liberator 0.6pre
  * @author otsune (based on teramako)
- * @version 0.1
+ * @version 0.2
  * 
  * Variable:
  *  g:pukka_normalizelink
  *      Specifies keys that use Pathtraq URL Normalizer 
- *      usage: let g:pukka_normalizelink = "true"
+ *      usage: let g:pukka_normalizelink = true
  * Mappings:
  *  '[C-z]':
  * Commands:
@@ -20,7 +20,7 @@
  */
 
 (function(){
-    var useNormalizelink = window.eval(liberator.globalVariables.pukka_normalizelink) || false;
+    var useNormalizelink = liberator.globalVariables.pukka_normalizelink || false;
 liberator.commands.addUserCommand(['pukka','pu'], 'Post to Pukka bookmark',
 function(args){
     if (!liberator.buffer.title || !liberator.buffer.URL || liberator.buffer.URL=='about:blank'){
@@ -29,7 +29,7 @@ function(args){
     var str = 'pukka:';
     var title = encodeURIComponent(liberator.buffer.title);
     var url = encodeURIComponent(liberator.buffer.URL);
-    var extend = liberator.buffer.getCurrentWord();
+    var extend = encodeURIComponent(window.content.getSelection().toString() || '');
     if (args){
         url = encodeURIComponent(args);
     }
@@ -38,9 +38,9 @@ function(args){
     completer: function(filter){
         var complist = [];
         if(useNormalizelink){
-            complist.push([getNormalizedPermalink(liberator.buffer.URL), 'Normalized URL']);
+            complist.push([getNormalizedPermalink(liberator.buffer.URL), 'Normalized URL: ' + liberator.buffer.title]);
         }
-        complist.push([liberator.buffer.URL, 'Raw URL']); 
+        complist.push([liberator.buffer.URL, 'Raw URL: ' + liberator.buffer.title]); 
         return [0, complist];
     }
 }
@@ -49,7 +49,7 @@ function(args){
 liberator.mappings.addUserMap([liberator.modes.NORMAL], 
 ['<C-z>'], 'Post to Pukka', 
 function() {
-    var urlarg = window.eval(liberator.globalVariables.pukka_normalizelink) ?
+    var urlarg = liberator.globalVariables.pukka_normalizelink ?
                  getNormalizedPermalink(liberator.buffer.URL) :
                  liberator.buffer.URL ;
     liberator.commandline.open(