summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-10-14 21:15:16 +0200
committerBart Visscher <bartv@thisnet.nl>2012-10-14 21:15:47 +0200
commit1e37bc139bb28e6fe9b0dd0d477e2dbef5a2cab9 (patch)
treefa56b07316b914f39e2dd02b70a61b05b016b967 /js
parent365cecd2ec1bf2552ae0d8e064680ed36b0bf04e (diff)
Whitespace cleanup
Diffstat (limited to 'js')
-rw-r--r--js/cache.js2
-rw-r--r--js/firstrun.js6
-rw-r--r--js/items.js4
-rw-r--r--js/main.js8
-rw-r--r--js/menu.js16
-rw-r--r--js/news.js14
-rw-r--r--js/settings.js6
7 files changed, 26 insertions, 30 deletions
diff --git a/js/cache.js b/js/cache.js
index 08353bae8..d73ed0063 100644
--- a/js/cache.js
+++ b/js/cache.js
@@ -30,5 +30,3 @@
exports.Cache = Cache;
}(typeof exports === "undefined" ? (this.moduleName = {}): exports));
-
-
diff --git a/js/firstrun.js b/js/firstrun.js
index 532b0e9cb..cc06fbccf 100644
--- a/js/firstrun.js
+++ b/js/firstrun.js
@@ -1,9 +1,7 @@
var News = News || {};
$(document).ready(function(){
-
- $('#browsebtn_firstrun, #cloudbtn_firstrun, #importbtn_firstrun').hide();
-
-});
+ $('#browsebtn_firstrun, #cloudbtn_firstrun, #importbtn_firstrun').hide();
+});
diff --git a/js/items.js b/js/items.js
index cf6107ad0..4a71094b6 100644
--- a/js/items.js
+++ b/js/items.js
@@ -36,7 +36,7 @@ var News = News || {};
$(window).resize(function(){
self._setScrollBottom();
});
-
+
// mark items whose title was hid under the top edge as read
this._scrollTimeoutMiliSecs = 100;
this._markReadTimeoutMiliSecs = 500;
@@ -354,7 +354,7 @@ var News = News || {};
*/
ItemCache.prototype._getSortedItemIds = function(type, id) {
var pairs = this._getItemIdTimestampPairs(type, id);
-
+
var sorted = pairs.slice(0).sort(function(a, b) {
return a.value - b.value;
});
diff --git a/js/main.js b/js/main.js
index 6c88e9cfe..e5a313841 100644
--- a/js/main.js
+++ b/js/main.js
@@ -46,7 +46,7 @@ $(document).ready(function(){
$('#addfeed_dialog .menu').append($folder);
});
});
-
+
$('#addfolder').click(function() {
$('#addfolder_dialog').dialog('open');
$('#folder_add_name').val('');
@@ -104,9 +104,9 @@ $(document).ready(function(){
$(this).addClass('show_all').removeClass('show_unread');
$(this).attr('title', t('news', 'Show everything'));
}
-
+
News.Objects.Menu.triggerHideRead();
-
+
$.post(OC.filePath('news', 'ajax', 'usersettings.php'), data, function(jsondata){
if(jsondata.status == 'success'){
News.Objects.Menu.setShowAll(data.showAll);
@@ -115,7 +115,7 @@ $(document).ready(function(){
}
});
});
-
+
$(document).click(function(event) {
$('#feedfoldermenu').hide();
});
diff --git a/js/menu.js b/js/menu.js
index 25f5ae135..26b4a75ad 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -19,7 +19,7 @@
We create a new instance of the menu. Then we need to bind it on an ul which contains
all the items:
-
+
var updateIntervalMiliseconds = 2000;
var items = new News.Items('#feed_items');
var menu = new News.Menu(updateIntervalMiliseconds, items);
@@ -44,7 +44,7 @@ Deleting nodes:
Creating nodes:
-
+
var parentId = 0;
var html = '<nodehtml>';
menu.addNode(parentId, html);
@@ -171,7 +171,7 @@ var News = News || {};
Menu.prototype.updateNode = function(type, id, data){
var $node = this._getNodeFromTypeAndId(type, id);
id = parseInt(id, 10);
-
+
if(data.title !== undefined){
// prevent xss
var title = $('<div>').text(data.title).html();
@@ -339,11 +339,11 @@ var News = News || {};
this._$activeFeed = $('#feeds .active');
this._activeFeedId = this._$activeFeed.data('id');
this._activeFeedType = this._listItemToMenuNodeType(this._$activeFeed);
-
+
setTimeout(function(){
self._updateUnreadCountAll();
}, 3000);
-
+
setInterval(function(){
self._updateUnreadCountAll();
}, self._updateInterval);
@@ -592,7 +592,7 @@ var News = News || {};
OC.dialogs.alert(jsonData.data.message, t('news', 'Error'));
}
});
-
+
break;
}
};
@@ -651,13 +651,13 @@ var News = News || {};
*/
Menu.prototype._toggleCollapse = function($listItem){
$listItem.toggleClass('open');
-
+
var folderId = this._getIdAndTypeFromNode($listItem).id;
var data = {
'folderId': folderId,
'opened': $listItem.hasClass('open')
};
-
+
$.post(OC.filePath('news', 'ajax', 'collapsefolder.php'), data, function(jsondata){
if(jsondata.status != 'success'){
OC.dialogs.alert(jsonData.data.message, t('news', 'Error'));
diff --git a/js/news.js b/js/news.js
index bc7e7348c..953afab27 100644
--- a/js/news.js
+++ b/js/news.js
@@ -63,9 +63,9 @@ News = {
$(button).prop('value', t('news', 'Changing...'));
var url = OC.filePath('news', 'ajax', 'changefoldername.php');
- var data = {
- folderName: folderName,
- folderId: folderId
+ var data = {
+ folderName: folderName,
+ folderId: folderId
};
$.post(url, data, function(jsonData){
@@ -93,7 +93,7 @@ News = {
$(button).attr("disabled", true);
$(button).prop('value', t('news', 'Adding...'));
-
+
var folderid = 0;
if($('#firstrun').length == 0){
folderid = $('#addfeed_dialog .inputfolderid').val();
@@ -106,9 +106,9 @@ News = {
dataType: "json",
success: function(jsonData){
if($('#firstrun').length > 0){
- window.location.reload();
+ window.location.reload();
} else {
- if(jsonData.status == 'success'){
+ if(jsonData.status == 'success'){
News.Objects.Menu.addNode(folderid, jsonData.data.listfeed);
News.Objects.Menu.load(News.MenuNodeType.Feed, jsonData.data.feedid);
$('#addfeed_dialog').dialog('close');
@@ -128,7 +128,7 @@ News = {
}
});
},
-
+
},
}
diff --git a/js/settings.js b/js/settings.js
index ae6e7257e..4d5956cbd 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -35,13 +35,13 @@ News.Settings={
if (News.Settings.importkind == News.Settings.IMPORTCLOUD) {
path = News.Settings.importpath;
} else if (this.importkind == this.IMPORTLOCAL) {
-
+
}
$.post(OC.filePath('news', 'ajax', 'importopml.php'), { path: path }, function(jsondata){
if (jsondata.status == 'success') {
- var message = jsondata.data.countsuccess + t('news', ' out of ') + jsondata.data.count +
- t('news', ' feeds imported successfully from ') + jsondata.data.title;
+ var message = jsondata.data.countsuccess + t('news', ' out of ') + jsondata.data.count +
+ t('news', ' feeds imported successfully from ') + jsondata.data.title;
OC.dialogs.alert(message, t('news', 'Success'));
} else {
OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));