From c6bb9a7b0c62e54b3771e82a9045236c20174653 Mon Sep 17 00:00:00 2001 From: anekos Date: Sat, 1 Nov 2008 15:51:21 +0000 Subject: CVS Head対応。 git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@22530 d0d07461-0603-4401-acd4-de1884942a52 --- browser_object.js | 2 +- moreqmarks.js | 20 ++++++++++---------- umihara.js | 2 +- xpcom_inspector.js | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/browser_object.js b/browser_object.js index 0515cd6..8217fd8 100644 --- a/browser_object.js +++ b/browser_object.js @@ -72,7 +72,7 @@ for(var i = 0 ; i < ary.length; i++) if(typeof ary[i] == "object") copyStrings.push(ary[i].linkedBrowser.contentDocument.location.href); - liberator.util.copyToClipboard(copyStrings.join(", ")); + liberator.modules.util.copyToClipboard(copyStrings.join(", ")); }, reload: function(ary){ for(var i = 0 ; i < ary.length; i++) diff --git a/moreqmarks.js b/moreqmarks.js index 6b3f0a9..fc178a5 100644 --- a/moreqmarks.js +++ b/moreqmarks.js @@ -117,7 +117,7 @@ } function list_qmarks(marks) { if(use_position) { - var list = ":" + liberator.util.escapeHTML(liberator.modules.commandline.getCommand()) + "
" + + var list = ":" + liberator.modules.util.escapeHTML(liberator.modules.commandline.getCommand()) + "
" + ""; for (var i = 0; i < marks.length; i++) { @@ -125,18 +125,18 @@ "" + "" + "" + - "" + + "" + ""; } list += "
marklinecolfile
" + marks[i][0] + "" + Math.round(marks[i][2] * 100) + "%" + Math.round(marks[i][3] * 100) + "%" + liberator.util.escapeHTML(marks[i][1]) + "" + liberator.modules.util.escapeHTML(marks[i][1]) + "
"; return list; } else { - var list = ":" + liberator.util.escapeHTML(liberator.modules.commandline.getCommand()) + "
" + + var list = ":" + liberator.modules.util.escapeHTML(liberator.modules.commandline.getCommand()) + "
" + ""; for (var i = 0; i < marks.length; i++) { list += ""; + ""; } list += "
QuickMarkURL
" + marks[i][0] + - "" + liberator.util.escapeHTML(marks[i][1]) + "
" + liberator.modules.util.escapeHTML(marks[i][1]) + "
"; return list; @@ -154,7 +154,7 @@ for (var i = 0; i < items.length; i++) { [number, title] = items[i][0].split(/:\s+/, 2); - var marked_url = liberator.util.escapeHTML(items[i][1]); + var marked_url = liberator.modules.util.escapeHTML(items[i][1]); if(marked_url == url) { liberator.modules.tabs.switchTo(number); var win = getBrowser().selectedTab.linkedBrowser.contentWindow; @@ -284,13 +284,13 @@ ["gd"], "Delete QuickMark for current URL", function () { - liberator.plugins.moreqmarks.remove('', liberator.buffer.URL); + liberator.plugins.moreqmarks.remove('', liberator.modules.buffer.URL); }); liberator.modules.mappings.addUserMap(modes, ["gs"], "Push QuickMarkStack for current URL", function () { - liberator.plugins.moreqmarks.add("", liberator.buffer.URL, "stack"); + liberator.plugins.moreqmarks.add("", liberator.modules.buffer.URL, "stack"); }); liberator.modules.mappings.addUserMap(modes, ["gS"], "Pop QuickMarkStack and Jump", @@ -306,7 +306,7 @@ ["gq"], "Queue QuickMarkQueue for current URL", function () { - liberator.plugins.moreqmarks.add("", liberator.buffer.URL, "queue"); + liberator.plugins.moreqmarks.add("", liberator.modules.buffer.URL, "queue"); }); liberator.modules.mappings.addUserMap(modes, ["gQ"], "Dequeue QuickMarkStack and Jump", @@ -323,7 +323,7 @@ liberator.modules.commands.add(["qmarkpu[sh]", "qmpu[sh]"], "Push QuickMarkStack for current URL", function () { - liberator.plugins.moreqmarks.add("", liberator.buffer.URL, "stack"); + liberator.plugins.moreqmarks.add("", liberator.modules.buffer.URL, "stack"); }); liberator.modules.commands.add(["qmarkpo[p]", "qmpo[p]"], "Pop QuickMarkStack and Jump", function () @@ -339,7 +339,7 @@ liberator.modules.commands.add(["qmarkqu[eue]", "qmqu[eue]"], "Queue QuickMarkQueue for current URL", function () { - liberator.plugins.moreqmarks.add("", liberator.buffer.URL, "queue"); + liberator.plugins.moreqmarks.add("", liberator.modules.buffer.URL, "queue"); }); liberator.modules.commands.add(["qmarkde[que]", "qmde[que]"], "Dequeue QuickMarkStack and Jump", function () diff --git a/umihara.js b/umihara.js index 13e88f6..637fb26 100644 --- a/umihara.js +++ b/umihara.js @@ -80,7 +80,7 @@ '\n time: ' + m[1]; liberator.echo(text); if (clipboard) - liberator.util.copyToClipboard(text); + liberator.modules.util.copyToClipboard(text); } else { //liberator.open(url); liberator.echoerr('parse error'); diff --git a/xpcom_inspector.js b/xpcom_inspector.js index e4ac07f..9d4e792 100644 --- a/xpcom_inspector.js +++ b/xpcom_inspector.js @@ -115,7 +115,7 @@ commands.addUserCommand(['lscc'], 'List XPCOM class', liberator.echo(liberator.XPCOM.listClass(args[0], null, true), true); } else if (args[1] in Ci){ let instance = tree[toKey(args[0])].interface[args[1]].create(); - echo(liberator.util.objectToString(instance, true), true); + echo(liberator.modules.util.objectToString(instance, true), true); } else { liberator.echo(liberator.XPCOM.listClass(args[0], args[1], true), true); } -- cgit v1.2.3