diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/changes.txt releases/unplug-2.002/changes.txt
1,33d0
< UnPlug 2.001
< ============
< 
< 2.001 has bugfixes and minor changes from 2.000 [chiba].
< 
< Results
< -------
<  * FlashGot added to "downloaders". Dta used by default if you have both - you
<    can't select which one you prefer yet.
<  * Copy Url added to the "openers" list (although it's not really an
<    "opener" :-)
<  * Results containing .swf colored gray
< 
< SearchPage
< ----------
<  * Stop button fixed
< 
< Search
< ------
<  * <each_re> no longer fails when "tagname" parameter is given and there is no
<    dom object available (if gets applied to the whole page)
<  * <rule goto="*" /> re-applies all rules
<  * ${jsdecode:...} unescapes \xNN javascript escapes
< 
< Rules.xml
< ---------
<  * google video fixed (this failed due to a bug in 2.000
<  * google video search changed to follow the link to the result that's
<    currently playing, and apply all rules to that item
<  * apple.com trailers for non-hd.
<  * crunchyroll.com, darktube.com added
<  * <param> tags searched (<embed> may be missing)
< 
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/diff.txt releases/unplug-2.002/diff.txt
1,337d0
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/common.js releases/unplug-2.000/source/chrome/content/common.js
< 135c135
< < 	version  : 2.001,
< ---
< > 	version  : 2.0,
< 139c139
< < 	revision : 200904051824,
< ---
< > 	revision : 200903312332,
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/config.xul releases/unplug-2.000/source/chrome/content/config.xul
< 71d70
< < 							<menuitem label="&copyurl.label;" value="copyurl"/>
< 91d89
< < 					<label onclick="window.open(&quot;https://addons.mozilla.org/en-US/firefox/addon/220&quot;);" class="text-link" value="&downloader.flashgot;" />
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/rules.js releases/unplug-2.000/source/chrome/content/rules.js
< 256,259c256,258
< < 			if (data.tagname && !doc)
< < 				UnPlug2.log("No document for if_re with elemname - searching page");
< < 			
< < 			if (data.tagname && doc) {
< ---
< > 			if (data.tagname) {
< > 				if (!doc)
< > 					throw "No document for if_re with elemname";
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/rules.xml releases/unplug-2.000/source/chrome/content/rules.xml
< 61d60
< < 		<!-- TODO - when we have binary downloads, we can treat the orignial .mov file as a playlist element -->
< 64,67c63
< < 			<media url="${movredirect.1}h${movredirect.2}" type="mov" description="${translate:hd_quality}" />
< < 		</each_re>
< < 		<each_re ref="movredirect" re="(http://[^&quot;']*?apple\.com/[^&quot;']+?_h)\.(\d+\.mov)">
< < 			<media url="${movredirect.1}${movredirect.2}" type="mov" />
< ---
< > 			<media url="${movredirect.1}h${movredirect.2}" type="mov" />
< 103a100,117
< > 	<rule id="generic_link" priority="low">
< > 		<each_element ref="alink" tagname="a" require_attrs="href" attrs="innerHTML" slow="yes">
< > 			<rule id="generic_media_link">
< > 				<if_ext is_media="yes" filename="${alink.href}" />
< > 				<media url="${alink.href}" description="${alink.innerHTML}" />
< > 			</rule>
< > 			<rule id="a.multiply.com">
< > 				<!-- replace this with flash player one. -->
< > 				<if_url host="multiply.com" />
< > 				<if_re string="${qparam:xurl:alink.href}"> /playlist/ </if_re>
< > 				<playlist url="${qparam:xurl:alink.href}" type="m3u">
< > 					<each_re ref="m3u" re="(.+)">
< > 						<media url="${m3u.1}" />
< > 					</each_re>
< > 				</playlist>
< > 			</rule>
< > 		</each_element>
< > 	</rule>
< 157d170
< < 					<!-- possibly not working as we don't serialize page any more -->
< 163d175
< < <media url="${embedelem.src}" />
< 197,216d208
< < 				<rule id="embedsrc" priority="low">
< < 					<!-- normally swf files, can be any embed -->
< < 					<media src="${embedelem.src}" description="${translate:embedplayer}"/>
< < 				</rule>
< < 			</each_element>
< < 			<each_element ref="param" tagname="param" require_attrs="name,value">
< < 				<rule id="pram.default">
< < 					<if_re string="${param.name}" flags="i"> (movie|src|href) </if_re>
< < 					<media url="${param.value}" description="${translate:embedplayer}"/>
< < 				</rule>
< < 				<rule id="param.youtube.com">
< < 					<if_re ref="embedyoutube" string="${param.value}">
< < 						youtube\.com\/v\/([^&amp;]+)
< < 					</if_re>
< < 					<download url="http://www.youtube.com/get_video_info?&amp;video_id=${embedyoutube.1}&amp;el=embedded&amp;ps=default">
< < 						<if_re ref="token"> token=([^&amp;]+)&amp; </if_re>
< < 						<if_re ref="title" optional="yes"> title=([^&amp;]+)&amp; </if_re>
< < 						<media description="${urldecode:title.1}" url="http://www.youtube.com/get_video?video_id=${embedyoutube.1}&amp;t=${token.1}" />
< < 					</download>
< < 				</rule>
< 219,225d210
< < 		<!-- other rules which need re-download -->
< < 		<rule id="darktube.com">
< < 			<if_url host="darktube.com" />
< < 			<if_re ref="vid"> addVariable\(&quot;content_video&quot;,\s*&quot;([^&quot;]+)&quot;\) </if_re>
< < 			<optional_re ref="thumb"> &quot;unit_long(\d+)&quot; </optional_re>
< < 			<media url="http://media.darktube.com/${vid.1}" thumbnail="http://ss.darktube.com/thumbs/${thumb.1}.jpg" />
< < 		</rule>
< 233,238d217
< < 	<rule id="crunchyroll.com">
< < 		<if_url host="crunchyroll.com" />
< < 		<if_re ref="videoid"> video_id%3D%27(\d+)%27 </if_re>
< < 		<if_re ref="mediaid"> media_id%3D%27(\d+)%27 </if_re>
< < 		<media url="http://www.crunchyroll.com/getitem?videoid=${videoid.1}&amp;mediaid=${mediaid.1}" />
< < 	</rule>
< 332,342d310
< < 	<rule id="search.googlevideo">
< < 		<!-- for google video search, grab the link to the page the video is really on -->
< < 		<if_url inhost="google" />
< < 		<if_re ref="div" flags="mi"> &lt;div\s+id=[&quot;']current\-title[&quot;']\s*&gt;([\s\S]*?)&lt;/div\s*&gt; </if_re>
< < 		<rule>
< < 			<if_re ref="url" string="${div.1}"> href=[&quot;'](http://[^&quot;']+)[&quot;'] </if_re>
< < 			<download url="${url.1}">
< < 				<rule goto="*" />
< < 			</download>
< < 		</rule>
< < 	</rule>
< 396,450d363
< < 	<rule id="addvariable">
< < 		<!--
< < 		Applies to many sites:
< < 			* xn-/-hentaienespaol-1nb.com
< < 		-->
< < 		<each_element ref="script" tagname="script" require_attrs="innerHTML">
< < 			<each_re ref="video" string="${script.innerHTML}" re="(addParam|addVariable)\s*\(\s*[&quot;'](file|content_video|video)[&quot;']\s*,\s*[&quot;'](.*?)[&quot;']\s*\)">
< < 				<optional_re ref="thumbnail" string="${script.innerHTML}"> (addParam|addVariable)\s*\(\s*[&quot;'](image|thumbnail)[&quot;']\s*,\s*[&quot;'](.*?)[&quot;']\s*\) </optional_re>
< < 				<media url="${video.3}" thumbnail="${thumbnail.3}" />
< < 			
< < 			</each_re>
< < 		</each_element>
< < 	</rule>
< < 	<rule id="mtv.de">
< < 		<!-- <if_url host="mtv.de" inpath="videos" /> -->
< < 		<if_re> intl\.esperanto\.mtvi\.com </if_re>
< < 		<if_re tagname="script" ref="videoid"> var uri\s*=\s*&quot;(.*?)&quot; </if_re>
< < 		<download url="http://intl.esperanto.mtvi.com/www/xml/video.jhtml?uri=${urlencode:videoid.1}" >
< < 			<optional_element ref="image" tagname="media:thumbnail" attrs="url" />
< < 			<each_element ref="content" tagname="media:content" require_attrs="url">
< < 				<download url="${content.url}">
< < 					<if_element ref="src" tagname="src" require_attrs="innerHTML" />
< < 					<media url="${src.innerHTML}" thumbnail="${image.url}" />
< < 				</download>
< < 			</each_element>
< < 		</download>
< < 	</rule>
< < 	<rule id="noembed.video.google.com">
< < 		<if_url inhost="google" />
< < 		<if_re ref="playerurl" tagname="script"> (googleplayer\.swf\?[^&quot;']+)[&quot;'] </if_re>
< < 		<media url="${qparam:videoUrl:jsdecode:playerurl.1}" thumbnail="${qparam:thumbnailUrl:jsdecode:playerurl.1}" />
< < 	</rule>
< < 	<!--
< < 	Lower priority
< < 	-->
< < 	<rule id="generic_link" priority="low">
< < 		<each_element ref="alink" tagname="a" require_attrs="href" attrs="innerHTML" slow="yes">
< < 			<rule id="generic_media_link">
< < 				<if_ext is_media="yes" filename="${alink.href}" />
< < 				<media url="${alink.href}" description="${alink.innerHTML}" />
< < 			</rule>
< < 			<rule id="a.multiply.com">
< < 				<!-- replace this with flash player one. -->
< < 				<if_url host="multiply.com" />
< < 				<if_re string="${qparam:xurl:alink.href}"> /playlist/ </if_re>
< < 				<playlist url="${qparam:xurl:alink.href}" type="m3u">
< < 					<each_re ref="m3u" re="(.+)">
< < 						<media url="${m3u.1}" />
< < 					</each_re>
< < 				</playlist>
< < 			</rule>
< < 		</each_element>
< < 	</rule>
< < 	<rule id="guessed_text_link" priority="low">
< < 	</rule>
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/search.js releases/unplug-2.000/source/chrome/content/search.js
< 276,296d275
< < 			 * Decodes \xNN javascript escape sequences
< < 			 */
< < 			case "jsdecode":
< < 				return this._subst_apply_functions(parts).replace(
< < 					/\\(b|f|n|r|t|v|\'|\"|\\|[0-7]{3}|x[0-9a-fA-F]{2}|u[0-9a-fA-f]{4})/g, function (wholematch, esc, offset, origstring) {
< < 						switch (esc.charAt(0)) {
< < 							case "b" : return "\b";
< < 							case "f" : return "\f";
< < 							case "n" : return "\n";
< < 							case "r" : return "\r";
< < 							case "t" : return "\t";
< < 							case "v" : return "\v";
< < 							case "\'" : return "\'";
< < 							case "\"" : return "\"";
< < 							case "x": return String.fromCharCode(parseInt(esc.substring(1), 16));
< < 							case "u": return String.fromCharCode(parseInt(esc.substring(1), 16));
< < 							case "0": case "1": case "2": case "3": case "4": case "5": case "6": case "7": return String.fromCharCode(parseInt(esc, 8));
< < 						}
< < 						throw "Unknown escape in jsdecode " + esc;
< < 					});
< < 			/**
< 467,479d445
< < 	/**
< < 	 * returns an array of css classes for the <unplug_result> widget
< < 	 */
< < 	cssclasses : function () {
< < 		if (this._is_swf())
< < 			return ["swf"];
< < 		return [];
< < 	},
< < 	
< < 	_is_swf : function () {
< < 		return Boolean(this.url.indexOf(".swf") >= 0);
< < 	},
< < 	
< 563,568c529,531
< < 		for (var i = 0; i < UnPlug2Search._downloads.length; i++) {
< < 			var d = UnPlug2Search._downloads[i];
< < 			if (d && d.download) {
< < 				d.download.cancel()
< < 			}
< < 		}
< ---
< > 		for each ( d in UnPlug2Search._downloads )
< > 			if (d && d.download)
< > 				d.cancel()
< 787,791c750
< < 								if (node.getAttribute("goto") === "*") {
< < 									referenced_node = UnPlug2Search.get_rules_xml()
< < 								} else {
< < 									referenced_node = UnPlug2.get_element(UnPlug2Search.get_rules_xml(), "rule", node.getAttribute("goto"));
< < 								}
< ---
< > 								referenced_node = UnPlug2.get_element(UnPlug2Search.get_rules_xml(), "rule", node.getAttribute("goto"));
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/searchpage.js releases/unplug-2.000/source/chrome/content/searchpage.js
< 48,50d47
< < 		this.capabilities['flashgot'] = (
< < 			UnPlug2.get_root_pref("extensions.{19503e42-ca3c-4c27-b1e2-9cdb2170ee34}.description")
< < 			? true : false )
< 53,56d49
< < 		// clipboard
< < 		this._clipboard = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
< < 			.getService(Components.interfaces.nsIClipboardHelper);  
< < 		
< 139d131
< < 			reselem.setAttribute("class", result.cssclasses().join(" "));
< 184,187d175
< < 	copy_url : function (reselem) {
< < 		UnPlug2SearchPage._clipboard.copyString(reselem.getAttribute("url"));
< < 	},
< < 	
< 246,250d233
< < 	download_flashgot : function (reselem) {
< < 		var fg = UnPlug2SearchPage._gbrowser.gFlashGotService;
< < 		fg.download(["http://example.com"], fg.OP_ONE);
< < 	},
< < 	
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/searchpage.xul releases/unplug-2.000/source/chrome/content/searchpage.xul
< 49c49
< < 		<button oncommand="UnPlug2SearchPage.abort();" id="stop_button" label="&stop.label;"  accesskey="&stop.accesskey;" />
< ---
< > 		<button oncommand="UnPlug2SearchPage.abort();" id="stop_button" label="Stop"  accesskey="S" />
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/widgets/unplug_result.xbl releases/unplug-2.000/source/chrome/content/widgets/unplug_result.xbl
< 55,57d54
< < 						case "copyurl":
< < 							default_open = document.getAnonymousElementByAttribute(this, "id", "copy_url");
< < 							break;
< 83,88d79
< < 					if (caps['flashgot']) {
< < 						var el = document.getAnonymousElementByAttribute(this, "id", "dl_flashgot")
< < 						el.style.display = "block";
< < 						default_dl = el;
< < 					}
< < 					
< 156,163d146
< < 								id="copy_url"
< < 								accesskey="&copyurl.accesskey;"
< < 								label="&copyurl.label;"
< < 								tooltiptext="&copyurl.tooltip;"
< < 								class="menuitem-iconic copyurl"
< < 								oncommand="UnPlug2SearchPage.copy_url(document.getBindingParent(this)); event.stopPropagation();"
< < 								/>
< < 							<xul:menuitem
< 168d150
< < 								class="menuitem-iconic opentab"
< 176d157
< < 								class="menuitem-iconic opennew"
< 184d164
< < 								class="menuitem-iconic openover"
< 221,229d200
< < 							<xul:menuitem
< < 								id="dl_flashgot"
< < 								style="display : none;"
< < 								accesskey="&dl.flashgot.accesskey;"
< < 								label="&dl.flashgot.label;"
< < 								tooltiptext="&dl.flashgot.tooltip;"
< < 								class="menuitem-iconic flashgot"
< < 								oncommand="UnPlug2SearchPage.download_flashgot(document.getBindingParent(this)); event.stopPropagation();"
< < 								/>
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/locale/en-US/config.dtd releases/unplug-2.000/source/chrome/locale/en-US/config.dtd
< 62d61
< < <!ENTITY downloader.flashgot "FlashGot">
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/locale/en-US/searchpage.dtd releases/unplug-2.000/source/chrome/locale/en-US/searchpage.dtd
< 31,32d30
< < <!ENTITY stop.label           "Stop">
< < <!ENTITY stop.accesskey       "S">
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/locale/en-US/strings.txt releases/unplug-2.000/source/chrome/locale/en-US/strings.txt
< 22c22
< < embedplayer=Embedded object (may be media player, not video)
< ---
< > 
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/locale/en-US/unplug_result.dtd releases/unplug-2.000/source/chrome/locale/en-US/unplug_result.dtd
< 40,42d39
< < <!ENTITY copyurl.label        "Copy link">
< < <!ENTITY copyurl.accesskey    "y">
< < <!ENTITY copyurl.tooltip      "">
< 56,59d52
< < <!ENTITY dl.flashgot.label    "FlashGot">
< < <!ENTITY dl.flashgot.accesskey "F">
< < <!ENTITY dl.flashgot.tooltip  "Download with the FlashGot extension.">
< < 
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/skin/searchpage.css releases/unplug-2.000/source/chrome/skin/searchpage.css
< 25,27c25
< < unplug_result.swf {
< < 	color: #666666;
< < }
< ---
< > 
< 44,58d41
< < toolbarbutton.flashgot,
< < menuitem.flashgot {
< < 	list-style-image: url("chrome://flashgot/skin/fg1.png");
< < }
< < 
< < toolbarbutton.opentab,
< < menuitem.opentab {
< < 	/* list-style-image: url(""); */
< < }
< < 
< < toolbarbutton.copyurl,
< < menuitem.copyurl {
< < 	list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
< < }
< < 
< 73,75d55
< < #stop_button[disabled] {
< < 	list-style-image: url("moz-icon://stock/gtk-stop?size=menu&state=disabled");
< < }
< diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/install.rdf releases/unplug-2.000/source/install.rdf
< 6c6
< < 		<em:version>2.001</em:version>
< ---
< > 		<em:version>2.0</em:version>
< Binary files releases/unplug-2.001/unplug.xpi and releases/unplug-2.000/unplug.xpi differ
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/common.js releases/unplug-2.002/source/chrome/content/common.js
135c135
< 	version  : 2.001,
---
> 	version  : 2.002,
139c139
< 	revision : 200904051824,
---
> 	revision : 200904100034,
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/config.xul releases/unplug-2.002/source/chrome/content/config.xul
84a85
> 							<menuitem label="&dl.saveas.label;" value="saveas"/>
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/overlay.js releases/unplug-2.002/source/chrome/content/overlay.js
35a36,38
> 		
> 		// popup window (if not closed) from last button click
> 		this._popup_window_ref = null;
44c47,53
< 			window.openDialog("chrome://unplug/content/searchpage.xul", "unplug_window", "chrome,centerscreen", data );
---
> 			try {
> 				UnPlug2Overlay._popup_win_ref.close();
> 			} catch(e) {
> 				// pass
> 			}
> 			UnPlug2Overlay._popup_win_ref = window.openDialog("chrome://unplug/content/searchpage.xul", "unplug_window", "chrome,centerscreen", data );
> 			UnPlug2Overlay._popup_win_ref.focus();
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/rules.js releases/unplug-2.002/source/chrome/content/rules.js
64a65,83
> 	 * Executes an ifnot_* statement.
> 	 * statement_name should not begin with "ifnot_"
> 	 * An ifnot_* statement is executes.
> 	 * If there's no if_* statement, the if_* (or each_*) statement is executed, and the opposite is returned. If <if_*> throws an exception, <ifnot_*> treats this as being true.
> 	 */
> 	exec_ifnot : function (statement_name, node, variables, url, text, doc) {
> 		var rule = UnPlug2Rules.get_rule("ifnot_" + statement_name);
> 		if (rule) {
> 			return (UnPlug2Rules.exec_statement(rule, node, variables, url, text, doc) !== false);
> 		}
> 		
> 		try {
> 			return (!UnPlug2Rules.exec_if(statement_name, node, variables, url, text, doc));
> 		} catch (e) {
> 			return true;
> 		}
> 	},
> 	
> 	/*
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/rules.xml releases/unplug-2.002/source/chrome/content/rules.xml
59a60,79
> 	<rule id="playlist..tudou.com">
> 		<if_url ref="url" host="tudou.com" />
> 		<!-- nocatch is a random number, i think. xml gives a list of flv files from different servers. -->
> 		<download url="http://v2.tudou.com/v2/cdn?id=${qparam:iid:url.url}&amp;noCatch=0000&amp;safekey=IAlsoNeverKnow">
> 			<each_element ref="f" tagname="f" require_attrs="innerHTML">
> 				<media url="${f.innerHTML}" type="flv" />
> 			</each_element>
> 		</download>
> 	</rule>
> 	<rule id="hd.tudou.com">
> 		<if_url host="tudou.com" />
> 		<if_re ref="iid" tagname="script"> iid\s*:\s*&quot;(\d+)&quot; </if_re>
> 		<optional_re ref="title" tagname="script"> title\s*:\s*&quot;(.*?)&quot; </optional_re>
> 		<!-- nocatch is a random number, i think. xml gives a list of flv files from different servers. -->
> 		<download url="http://v2.tudou.com/v2/kili?id=${iid.1}&amp;safekey=YouNeverKnowThat&amp;noCatch=0000">
> 			<each_element ref="f" tagname="f" require_attrs="innerHTML">
> 				<media url="${f.innerHTML}" type="flv" description="${translate:hd_quality} ${optional:title.1}" />
> 			</each_element>
> 		</download>
> 	</rule>
399a420
> 			* xhamster.com
404,405c425,434
< 				<media url="${video.3}" thumbnail="${thumbnail.3}" />
< 			
---
> 				<rule>
> 					<!-- same server == default -->
> 					<ifnot_url host="xhamster.com" />
> 					<media url="${video.3}" thumbnail="${thumbnail.3}" />
> 				</rule>
> 				<rule>
> 					<if_url host="xhamster.com" />
> 					<if_re ref="srv"> addVariable\('srv','([^']+)'\) </if_re>
> 					<media url="http://dl${srv.1}.xhamster.com/flv2/${video.3}" thumbnail="${thumbnail.3}" />
> 				</rule>
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/search.js releases/unplug-2.002/source/chrome/content/search.js
698a699
> 			var exectype = null;
700a702,706
> 				exectype = "if";
> 				optional = false;
> 			} else if (nodetagname.substring(0, 6) == "ifnot_") {
> 				funcname = nodetagname.substring(6);
> 				exectype = "ifnot";
703a710
> 				exectype = "optional";
715,718c722
< 				if (optional)
< 					result = UnPlug2Rules.exec_optional(funcname, node, variables, url, text, doc);
< 				else
< 					result = UnPlug2Rules.exec_if(funcname, node, variables, url, text, doc);
---
> 				result = UnPlug2Rules["exec_" + exectype](funcname, node, variables, url, text, doc);
778c782
< 			if (nodetagname.substring(0, 3) != "if_" && nodetagname.substring(0, 9) != "optional_" && nodetagname.substring(0, 5) != "each_") {
---
> 			if (nodetagname.substring(0, 3) != "if_" && nodetagname.substring(0, 6) != "ifnot_" && nodetagname.substring(0, 9) != "optional_" && nodetagname.substring(0, 5) != "each_") {
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/searchpage.js releases/unplug-2.002/source/chrome/content/searchpage.js
51a52
> 		this.capabilities['downloader'] = UnPlug2.get_pref("downloader");
68,69c69
< 		// TODO - localize
< 		document.getElementById("dynamic_results").value = "No results yet";
---
> 		document.getElementById("dynamic_results").value = UnPlug2.str("search_no_results_yet");
93d92
< 				// TODO - localize
96c95
< 					document.getElementById("dynamic_results").value = "No results";
---
> 					document.getElementById("dynamic_results").value = UnPlug2.str("search_no_results");
99c98
< 					document.getElementById("dynamic_results").value = "1 result";
---
> 					document.getElementById("dynamic_results").value = UnPlug2.str("search_1_result");
101c100
< 					document.getElementById("dynamic_results").value = "# results".replace("#", all_results.length);
---
> 					document.getElementById("dynamic_results").value = UnPlug2.str("search_n_results").replace("#", all_results.length);
133c132
< 			reselem.setAttribute("type", result.type || "");
---
> 			reselem.setAttribute("type", result.media_type_hint || "");
172c171,175
< 		window.open(reselem.getAttribute("url"));
---
> 		try {
> 			window.open(reselem.getAttribute("url"));
> 		} catch(e) {
> 			UnPlug2.log("newwin " + e);
> 		}
176,177c179,184
< 		var t = UnPlug2SearchPage._gbrowser.addTab(reselem.getAttribute("url"));
< 		UnPlug2SearchPage._gbrowser.selectedTab = t;
---
> 		try {
> 			var t = UnPlug2SearchPage._gbrowser.addTab(reselem.getAttribute("url"));
> 			UnPlug2SearchPage._gbrowser.selectedTab = t;
> 		} catch(e) {
> 			UnPlug2.log("newtab " + e);
> 		}
181c188,192
< 		UnPlug2SearchPage._win.location = reselem.getAttribute("url");
---
> 		try {
> 			UnPlug2SearchPage._win.location = reselem.getAttribute("url");
> 		} catch(e) {
> 			UnPlug2.log("overwin " + e);
> 		}
185c196,200
< 		UnPlug2SearchPage._clipboard.copyString(reselem.getAttribute("url"));
---
> 		try {
> 			UnPlug2SearchPage._clipboard.copyString(reselem.getAttribute("url"));
> 		} catch(e) {
> 			UnPlug2.log("copyurl " + e);
> 		}
189,194c204,214
< 		var source_url = reselem.getAttribute("url");
< 		var dest = "/home/user/DELETEME";
< 		var file = UnPlug2SearchPage._save_as_box();
< 		if (!file)
< 			return;
< 		UnPlug2SearchPage._download_with_downloadmgr(source_url, file);
---
> 		try {
> 			var source_url = reselem.getAttribute("url");
> 			var dest = "/home/user/DELETEME";
> 			var name = reselem.getAttribute("title", "").replace(RegExp("[^\\w\\s]+", "g"), "_");
> 			var file = UnPlug2SearchPage._save_as_box(name, reselem.getAttribute("type"));
> 			if (!file)
> 				return;
> 			UnPlug2SearchPage._download_with_downloadmgr(source_url, file);
> 		} catch(e) {
> 			UnPlug2.log("saveas " + e);
> 		}
200c220
< 	_save_as_box : function () {
---
> 	_save_as_box : function (name, ext) {
203a224,227
> 		name = name || "no name";
> 		ext = ext || "ext";
> 		filepicker.defaultString = name + "." + ext;
> 		//filepicker.defaultExtention = ext;
237,243c261,271
< 		var source_url = reselem.getAttribute("url");
< 		window.opener.DTA_AddingFunctions.saveSingleLink(
< 			false, //turbo
< 			source_url, //url
< 			String(UnPlug2SearchPage._win.location), // referer
< 			null, // description
< 			null) // post data
---
> 		try {
> 			var source_url = reselem.getAttribute("url");
> 			window.opener.DTA_AddingFunctions.saveSingleLink(
> 				false, //turbo
> 				source_url, //url
> 				String(UnPlug2SearchPage._win.location), // referer
> 				null, // description
> 				null) // post data
> 		} catch(e) {
> 			UnPlug2.log("dta " + e);
> 		}
247,248c275,280
< 		var fg = UnPlug2SearchPage._gbrowser.gFlashGotService;
< 		fg.download(["http://example.com"], fg.OP_ONE);
---
> 		try {
> 			var fg = UnPlug2SearchPage._gbrowser.gFlashGotService;
> 			fg.download(["http://example.com"], fg.OP_ONE);
> 		} catch(e) {
> 			UnPlug2.log("flashgot " + e);
> 		}
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/content/widgets/unplug_result.xbl releases/unplug-2.002/source/chrome/content/widgets/unplug_result.xbl
94a95,98
> 					if (caps['downloader'] == "saveas") {
> 						default_dl = document.getAnonymousElementByAttribute(this, "id", "dl_saveas")
> 					}
> 					
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/locale/en-US/strings.txt releases/unplug-2.002/source/chrome/locale/en-US/strings.txt
15a16,19
> search_no_results_yet=No results yet
> search_1_result=1 result
> search_n_results=# results
> search_no_results=No results
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/chrome/skin/searchpage.css releases/unplug-2.002/source/chrome/skin/searchpage.css
1d0
< 
31c30
< 	list-style-image: url("moz-icon://stock/gtk-preferences?size=menu");
---
> 	list-style-image: url("chrome://unplug/skin/tango-16/preferences-system.png");
36c35
< 	list-style-image: url("moz-icon://stock/gtk-save-as?size=menu");
---
> 	list-style-image: url("chrome://unplug/skin/tango-16/document-save-as.png");
48a48,52
> toolbarbutton.copyurl,
> menuitem.copyurl {
> 	list-style-image: url("chrome://unplug/skin/tango-16/edit-copy.png");
> }
> 
51c55
< 	/* list-style-image: url(""); */
---
> 	list-style-image: url("chrome://unplug/skin/tango-16/tab-new.png");
54,56c58,65
< toolbarbutton.copyurl,
< menuitem.copyurl {
< 	list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
---
> toolbarbutton.opennew,
> menuitem.opennew {
> 	list-style-image: url("chrome://unplug/skin/tango-16/window-new.png");
> }
> 
> toolbarbutton.openover,
> menuitem.openover {
> 	list-style-image: url("chrome://unplug/skin/tango-16/window.png");
70c79
< 	list-style-image: url("moz-icon://stock/gtk-stop?size=menu");
---
> 	list-style-image: url("chrome://unplug/skin/tango-16/process-stop.png");
74c83,84
< 	list-style-image: url("moz-icon://stock/gtk-stop?size=menu&state=disabled");
---
> 	/* greyscale; brightness + 100% */
> 	list-style-image: url("chrome://unplug/skin/tango-16/process-stop-disabled.png");
Binary files releases/unplug-2.001/source/chrome/skin/tango-16/document-save-as.png and releases/unplug-2.002/source/chrome/skin/tango-16/document-save-as.png differ
Binary files releases/unplug-2.001/source/chrome/skin/tango-16/edit-copy.png and releases/unplug-2.002/source/chrome/skin/tango-16/edit-copy.png differ
Binary files releases/unplug-2.001/source/chrome/skin/tango-16/preferences-system.png and releases/unplug-2.002/source/chrome/skin/tango-16/preferences-system.png differ
Binary files releases/unplug-2.001/source/chrome/skin/tango-16/process-stop-disabled.png and releases/unplug-2.002/source/chrome/skin/tango-16/process-stop-disabled.png differ
Binary files releases/unplug-2.001/source/chrome/skin/tango-16/process-stop.png and releases/unplug-2.002/source/chrome/skin/tango-16/process-stop.png differ
Binary files releases/unplug-2.001/source/chrome/skin/tango-16/tab-new.png and releases/unplug-2.002/source/chrome/skin/tango-16/tab-new.png differ
Binary files releases/unplug-2.001/source/chrome/skin/tango-16/window-new.png and releases/unplug-2.002/source/chrome/skin/tango-16/window-new.png differ
Binary files releases/unplug-2.001/source/chrome/skin/tango-16/window.png and releases/unplug-2.002/source/chrome/skin/tango-16/window.png differ
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/install.rdf releases/unplug-2.002/source/install.rdf
6c6
< 		<em:version>2.001</em:version>
---
> 		<em:version>2.002</em:version>
14c14
< 				<em:maxVersion>3.1.*</em:maxVersion>
---
> 				<em:maxVersion>3.5b4pre</em:maxVersion>
diff --new-file --recursive --suppress-common-lines releases/unplug-2.001/source/todo.txt releases/unplug-2.002/source/todo.txt
4,5d3
< Tell people when menu config is applied next restart.
< 
8c6
< More finely-grained optional/required attributes in UnPlug2Rules -- eg <if_re text="..." is optional, but should fail rule if it exists but is ""/error. -- name "failable"?
---
> Right-click popup on unplug_result widget
10c8,13
< Rules documentation
---
> Better object to send through search.js:_apply_rules_to_document() loop.
> 	This could contain a way of reading original target, so we can allow file:// links to be downloaded if it's the original target of the page
> 
> Tell people when menu config is applied next restart.
> 
> More finely-grained optional/required attributes in UnPlug2Rules -- eg <if_re text="..." is optional, but should fail rule if it exists but is ""/error. -- name "failable"?
15a19,20
> Rules documentation (needs more stable rules api)
> 
29a35
> Clean up the <rule> element situation where some require the dynamic version of the page, and others require a re-downloaded version (for consistency: the dynamic version can be serialized in different ways; and t avoid flashblock, etc). Perhaps group into <dynamic> and <static> (or <serialized> and <redownloaded>; or something) on the root node.
34c40,42
< <each_amf_string>, <each_swf_string> + binary downloads
---
> <each_amf_string>, <each_swf_string> + binary downloads + .mov files
> 
> Use web workers for evaluating <rule>s without DOM nodes (ie in <static>): https://developer.mozilla.org/En/Using_web_workers
Binary files releases/unplug-2.001/unplug.xpi and releases/unplug-2.002/unplug.xpi differ