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