Merge remote-tracking branch 'origin/master' into german-translation

1 files changed, 0 insertions, 53 deletions

diff --git a/plugins/googlereaderimport/init.js b/plugins/googlereaderimport/init.js
deleted file mode 100644
index 043952c75..000000000
--- a/plugins/googlereaderimport/init.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function starredImportComplete(iframe) {
-	try {
-		if (!iframe.contentDocument.body.innerHTML) return false;
-
-		Element.show(iframe);
-
-		notify('');
-
-		if (dijit.byId('starredImportDlg'))
-			dijit.byId('starredImportDlg').destroyRecursive();
-
-		var content = iframe.contentDocument.body.innerHTML;
-
-		if (content) Element.hide(iframe);
-
-		dialog = new dijit.Dialog({
-			id: "starredImportDlg",
-			title: __("Google Reader Import"),
-			style: "width: 600px",
-			onCancel: function() {
-				Element.hide(iframe);
-				this.hide();
-			},
-			execute: function() {
-				Element.hide(iframe);
-				this.hide();
-			},
-			content: content});
-
-		dialog.show();
-
-	} catch (e) {
-		exception_error("starredImportComplete", e);
-	}
-}
-
-function starredImport() {
-
-	var starred_file = $("starred_file");
-
-	if (starred_file.value.length == 0) {
-		alert(__("Please choose a file first."));
-		return false;
-	} else {
-		notify_progress("Importing, please wait...", true);
-
-		Element.show("starred_upload_iframe");
-
-		return true;
-	}
-}
-
-