Changeset 19809

Timestamp:

09/24/08 17:12:55 (5 years ago)

Author:

hogelog

Message:

• markを削除したときにデータ保存が行われないバグの修正
  

Files:

• lang/javascript/vimperator-plugins/trunk/moreqmarks.js (modified) (15 diffs)

lang/javascript/vimperator-plugins/trunk/moreqmarks.js

@@ -5 +5 @@
  * @description-ja QuickMarksに機能追加(位置の記憶、qmarksとは別のスタックとキュー追加)
  * @author         hogelog
- * @version        0.04
+ * @version        0.05
  * ==/VimperatorPlugin==
  *
@@ -34 +34 @@
 
     // TODO: move to a storage module
-    var defaultMarks = liberator.options.getPref("extensions.vimperator.quickmarks", "").split("\n");
     var savedMarks = liberator.options.getPref("extensions.vimperator.moreqmarks", "").split("\n");
     var savedMarkStack = liberator.options.getPref("extensions.vimperator.moreqmarkstack", "").split("\n");
@@ -41 +40 @@
     // load the saved quickmarks -- TODO: change to sqlite
     if(use_default_data) {
+        var defaultMarks = liberator.options.getPref("extensions.vimperator.quickmarks", "").split("\n");
         for (var i = 0; i < defaultMarks.length - 1; i += 2) {
             var url = defaultMarks[i+1];
@@ -76 +76 @@
                 qmark_queue.unshift(item);
                 break;
+            case "mark":
             default:
                 qmarks[qmark] = item;
@@ -84 +85 @@
         switch(target) {
             case "stack":
-                return qmark_stack.pop();
+                return qmark_stack[qmark_stack.length-1];
             case "queue":
-                return qmark_queue.pop();
+                return item = qmark_queue[qmark_queue.length-1];
+            case "mark":
             default:
                 return qmarks[qmark];
@@ -103 +105 @@
                 list = qmark_queue;
                 break;
+            case "mark":
             default:
                 list = qmarks; 
@@ -208 +211 @@
                 liberator.options.setPref("extensions.vimperator.moreqmarkqueue", savedQuickMarkQueue);
                 break;
+            case "mark":
             default:
                 var savedQuickMarks = "";
@@ -217 +221 @@
                 }
                 liberator.options.setPref("extensions.vimperator.moreqmarks", savedQuickMarks);
+                if(use_default_data) {
+                    var savedQuickMarks = "";
+                    for (var mark in qmarks) {
+                        savedQuickMarks += mark + "\n";
+                        savedQuickMarks += qmarks[mark].url + "\n";
+                    }
+                    liberator.options.setPref("extensions.vimperator.quickmarks", savedQuickMarks);
+                }
                 break;
         }
@@ -249 +261 @@
                 return witchWindow.getBrowser().selectedTab;
 
+            case "mark":
             default:
                 liberator.echoerr("Exxx: Invalid 'where' directive in liberator.plugins.moreqmarks openurls(...)");
@@ -285 +298 @@
         {
             var where = /\bquickmark\b/.test(liberator.options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
-            liberator.quickmarks.jumpTo("", where, true, "stack");
+            if(liberator.quickmarks.jumpTo("", where, true, "stack")) {
+                liberator.quickmarks.remove("", "", "stack");
+            }
         });
 
@@ -299 +314 @@
         {
             var where = /\bquickmark\b/.test(liberator.options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
-            liberator.quickmarks.jumpTo("", where, true, "queue");
+            if(liberator.quickmarks.jumpTo("", where, true, "queue")) {
+                liberator.quickmarks.remove("", "", "queue");
+            }
         });
 
@@ -364 +381 @@
         },
 
-        remove: function (filter, url)
-        {
-            if(url) {
-                for(var mark in qmarks) {
-                    if(url == qmarks[mark].url) {
-                        delete qmarks[mark];
-                        liberator.commandline.echo("delete qmark "+mark, liberator.commandline.HL_INFOMSG);
-                        return;
+        remove: function (filter, url, target)
+        {
+            var item;
+            switch(target) {
+                case "stack":
+                    if(item = qmark_stack.pop()) {
+                        liberator.commandline.echo("pop "+item.url, liberator.commandline.HL_INFOMSG);
+                        save_qmarks("stack");
+                    } else {
+                        liberator.echoerr('No QuickStack set');
                     }
-                }
-                liberator.echoerr('No QuickMark set to '+url);
-            } else {
-                var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
-
-                for (var qmark in qmarks) {
-                    if (pattern.test(qmark)) {
-                        delete qmarks[qmark];
-                        liberator.commandline.echo("delete qmark "+qmark, liberator.commandline.HL_INFOMSG);
-                        return;
+                    break;
+                case "queue":
+                    var item;
+                    if(item = qmark_queue.pop()) {
+                        liberator.commandline.echo("dequeue "+item.url, liberator.commandline.HL_INFOMSG);
+                        save_qmarks("queue");
+                    } else {
+                        liberator.echoerr('No QuickQueue set');
                     }
-                }
-                liberator.echoerr('No QuickMark match '+filter);
+                    break;
+                case "mark":
+                default:
+                    if(url) {
+                        for(var mark in qmarks) {
+                            if(url == qmarks[mark].url) {
+                                delete qmarks[mark];
+                                liberator.commandline.echo("delete qmark "+mark, liberator.commandline.HL_INFOMSG);
+                                save_qmarks("mark");
+                                return;
+                            }
+                        }
+                        liberator.echoerr('No QuickMark set to '+url);
+                    } else {
+                        var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
+
+                        for (var qmark in qmarks) {
+                            if (pattern.test(qmark)) {
+                                delete qmarks[qmark];
+                                liberator.commandline.echo("delete qmark "+qmark, liberator.commandline.HL_INFOMSG);
+                                save_qmarks("mark");
+                                return;
+                            }
+                        }
+                        liberator.echoerr('No QuickMark match '+filter);
+                    }
             }
         },
@@ -405 +446 @@
                         liberator.echoerr("E20: QuickMarkQueue is empty");
                         break;
+                    case "mark":
                     default:
                         liberator.echoerr("E20: QuickMark not set");
                         break;
                 }
-            }
+                return false;
+            }
+            return true;
         },
 
@@ -424 +468 @@
                         liberator.echoerr("No QuickMarkQueue set");
                         break;
+                    case "mark":
                     default:
                         liberator.echoerr("No QuickMarks set");
@@ -451 +496 @@
             // save_qmarks("stack");
             // save_qmarks("queue");
-            // save_qmarks("list");
+            // save_qmarks("mark");
         }
     };