Merge branch 'newsapp' of gitorious.org:owncloud/apps into newsapp

2 files changed, 16 insertions, 11 deletions

diff --git a/js/news.js b/js/news.js
index f431c1c3a..d9ac3cf6d 100644
--- a/js/news.js
+++ b/js/news.js
@@ -64,7 +64,7 @@ News={
 					if(jsondata.status == 'success'){
 						$('div[data-id="' + folderid + '"] > ul').append(jsondata.data.listfolder);
 						setupFeedList();
-						OC.dialogs.confirm(t('news', 'Do you want to add another feed?'), t('news', 'Feed added!'), function(answer) {
+						OC.dialogs.confirm(t('news', 'Do you want to add another folder?'), t('news', 'Folder added!'), function(answer) {
 							if(!answer) {
 								$('#addfolder_dialog').dialog('destroy').remove();
 							}
diff --git a/js/settings.js b/js/settings.js
index 0efba3974..f686644c3 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -1,15 +1,14 @@
 News = News || {}
 News.Settings={
-	Settings: {
-		importpath:'',
-		importkind:'',
+		IMPORTCLOUD:'cloud',
+		IMPORTLOCAL:'local',
 		cloudFileSelected:function(path){
 			$.getJSON(OC.filePath('news', 'ajax', 'selectfromcloud.php'),{'path':path},function(jsondata){
 				if(jsondata.status == 'success'){
 					$('#browsebtn, #cloudbtn, #importbtn').show();
 					$('#opml_file').text(t('news', 'File ') + path + t('news', ' loaded from cloud.'));
-					News.Settings.importkind = 'cloud';
-					News.Settings.importpath = jsondata.data.tmp;
+					this.importkind = this.IMPORTCLOUD;
+					this.importpath = jsondata.data.tmp;
 				}
 				else{
 					OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
@@ -31,10 +30,14 @@ News.Settings={
 			$(button).prop('value', t('news', 'Importing...'));
 
 			var path = '';
-			if (News.Settings.importkind == 'cloud') {
-				path = News.Settings.importpath;
-			} else {
-
+			alert(this.importkind);
+			if (this.importkind == this.IMPORTCLOUD) {
+				path = this.importpath;
+				alert(this.IMPORTCLOUD);
+			} else if (this.importkind == this.IMPORTLOCAL) {
+			}
+			else {
+				OC.dialogs.alert(t('news','Import kind not specified'), t('news', 'Error'));
 			}
 
 			$.post(OC.filePath('news', 'ajax', 'importopml.php'), { path: path }, function(jsondata){
@@ -42,9 +45,11 @@ News.Settings={
 					alert(jsondata.data.title);
 				}
 			});
+			
+			$(button).prop('value', t('news', 'Import'));
+			$(button).attr("disabled", false);
 
 		}
-	}
 }
 
 $('#browsebtn, #cloudbtn, #importbtn').hide();