Kaynağa Gözat

Petite simplification mise à jour JavaScript

https://github.com/marienfressinaud/FreshRSS/pull/414
Alexandre Alapetite 12 yıl önce
ebeveyn
işleme
7d9a813ed3
2 değiştirilmiş dosya ile 12 ekleme ve 13 silme
  1. 10 9
      app/views/javascript/actualize.phtml
  2. 2 4
      p/scripts/main.js

+ 10 - 9
app/views/javascript/actualize.phtml

@@ -1,10 +1,11 @@
 "use strict";
-var feeds = [];
-<?php foreach ($this->feeds as $feed) { ?>
-feeds.push("<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'actualize', 'params' => array ('id' => $feed->id (), 'ajax' => '1')), 'php'); ?>");
-<?php } ?>
-var feed_count = feeds.length;
-var feed_processed = 0;
+var feeds = [<?php
+	foreach ($this->feeds as $feed) {
+		echo "'", Minz_Url::display(array('c' => 'feed', 'a' => 'actualize', 'params' => array('id' => $feed->id(), 'ajax' => '1')), 'php'), "',\n";
+	}
+	?>],
+	feed_processed = 0,
+	feed_count = feeds.length;
 
 function initProgressBar(init) {
 	if (init) {
@@ -33,10 +34,10 @@ function updateFeeds() {
 }
 
 function updateFeed() {
-	if (feeds.length === 0) {
+	var feed = feeds.pop();
+	if (feed == undefined) {
 		return;
 	}
-	var feed = feeds.pop();
 	$.ajax({
 		type: 'POST',
 		url: feed,
@@ -50,4 +51,4 @@ function updateFeed() {
 			updateFeed();
 		}
 	});
-}
+}

+ 2 - 4
p/scripts/main.js

@@ -648,10 +648,8 @@ function init_actualize() {
 		return false;
 	});
 
-	if(auto_actualize_feeds) {
-		$.getScript('./?c=javascript&a=actualize').done(function () {
-			updateFeeds();
-		});
+	if (auto_actualize_feeds) {
+		$("#actualize").click();
 	}
 }