diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/chrome/content/common.js releases/unplug-2.025/source/chrome/content/common.js 135c135 < version : 2.024, --- > version : 2.025, 139c139 < revision : 200911101843, --- > revision : 201003210216, diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/chrome/content/config/config.js releases/unplug-2.025/source/chrome/content/config/config.js 74d73 < // remove button 76,79c75,79 < navtoolbar.removeChild(toolbarbutton); < if (navtoolbar.getAttribute("currentset")) { < if (navtoolbar.getAttribute("currentset").indexOf("urlbar-container") < 0) { < alert("There's a problem removing the toolbar button\n\n" + navtoolbar.getAttribute("currentset")); --- > // do persist thing (applies next restart) > var curSet = navtoolbar.currentSet; > if (curSet) { > if (curSet.indexOf("urlbar-container") < 0 && curSet.indexOf("search-container") < 0) { > alert("There's a problem removing the toolbar button\n\n" + curSet); 81c81 < navtoolbar.setAttribute("currentset", navtoolbar.getAttribute("currentset").replace(",unplug2_toolbarbutton", "")); --- > navtoolbar.setAttribute("currentset", curSet.replace(",unplug2_toolbarbutton", "")); 86a87,88 > // remove button (applies this session) > navtoolbar.removeChild(toolbarbutton); 88d89 < // add button 90,93c91,95 < navtoolbar.insertItem("unplug2_toolbarbutton", null, null, false); < if (navtoolbar.getAttribute("currentset")) { < if (navtoolbar.getAttribute("currentset").indexOf("urlbar-container") < 0) { < alert("There's a problem adding the toolbar button\n\n" + navtoolbar.getAttribute("currentset")); --- > // do persist thing (applies next restart) > var curSet = navtoolbar.currentSet; > if (curSet) { > if (curSet.indexOf("urlbar-container") < 0 && curSet.indexOf("search-container") < 0) { > alert("There's a problem adding the toolbar button\n\n" + curSet); 95c97 < navtoolbar.setAttribute("currentset", navtoolbar.getAttribute("currentset") + ",unplug2_toolbarbutton"); --- > navtoolbar.setAttribute("currentset", curSet + ",unplug2_toolbarbutton"); 100a103,104 > // add button (applies this session) > navtoolbar.insertItem("unplug2_toolbarbutton", null, null, false); 141,148c145,146 < // INSTALL TOOLBAR BUTTON < if (navigator.userAgent.indexOf("Firefox/3.0") < 0) { < // not tested on ff3.1 yet: < alert("UnPlug has skipped adding a toolbar button.\n\nYou can get a toolbar button by right clicking on a toolbar and clicking 'customize'."); < } else { < if (!detect_toolbarbutton()) < toggle_toolbarbutton(); < } --- > if (!detect_toolbarbutton()) > toggle_toolbarbutton(); diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/chrome/content/display/pop/pop.js releases/unplug-2.025/source/chrome/content/display/pop/pop.js 250c250 < ext = "ext"; // fallback --- > ext = "flv"; // fallback 255c255 < name = name.replace(RegExp("[^\\w\\s]+", "g"), "_"); --- > name = name.replace(RegExp("[^\\w\\s_\\-\\(\\)]+", "g"), "_"); 384c384 < var file = UnPlug2SearchPage._save_as_box(res.details.name, res.details.file_ext || "ext"); --- > var file = UnPlug2SearchPage._save_as_box(res.details.description || res.details.name, res.details.file_ext); diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/chrome/content/rules.xml releases/unplug-2.025/source/chrome/content/rules.xml 128,208d127 < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < 233a153,198 > > > > > > > > > > description="${translate:hd_quality} - ${optional:title.1}" type="mp4" /> > > > > description="${translate:low_quality} - ${optional:title.1}" type="flv" /> > > > > description="${translate:mid_quality} - ${optional:title.1}" type="flv" /> > > > > description="${translate:mid_quality} (mp4) - ${optional:title.1}" type="mp4" /> > > > > description="${translate:high_quality} - ${optional:title.1}" type="flv" /> > > > > description="Unknown quality code ${fmt_url.1} - ${optional:title.1}" type="flv" /> > > > > > > > > > > 383a349,353 > > > > > 461c431,432 < --- > > 526,528c497,499 < &amp;flv_url=(.*?)&amp; < &amp;url_bigthumb=(.*?)&amp; < --- > > > 539,546d509 < < < < < < < < diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/chrome/content/search/rules.js releases/unplug-2.025/source/chrome/content/search/rules.js 149a150,153 > if (node.hasAttribute("debug")) { > alert("Rule: " + rule + " Node: " + node + "\nVar: " + variables.toSource() + "\nUrl: " + url + "\nDoc: " + doc + "\n\n" + text); > } > 249d252 < diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/chrome/locale/en-US/strings.txt releases/unplug-2.025/source/chrome/locale/en-US/strings.txt 14,15c14,15 < search_1_active_download=1 active download < search_n_active_downloads=# active downloads --- > search_1_active_download=Searching 1 page > search_n_active_downloads=Searching # pages diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/chrome/locale/pl-PL/config.dtd releases/unplug-2.025/source/chrome/locale/pl-PL/config.dtd 29c29 < --- > 32c32 < --- > 39,40c39,40 < < --- > > 42c42 < --- > 44c44 < --- > 46,47c46,47 < < --- > > 52,53c52,53 < < --- > > 65,66c65,66 < < --- > > 70c70 < --- > diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/chrome.manifest releases/unplug-2.025/source/chrome.manifest 8c8 < # locale unplug en-US chrome/locale/de-DE/ --- > #locale unplug en-US chrome/locale/pl-PL/ diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.024/source/install.rdf releases/unplug-2.025/source/install.rdf 6c6 < 2.024 --- > 2.025 14c14 < 3.5.* --- > 3.7.* Binary files releases/unplug-2.024/unplug.xpi and releases/unplug-2.025/unplug.xpi differ