Browse Source

Améliorations suite à icon()

Contribue à https://github.com/marienfressinaud/FreshRSS/issues/284
Alexandre Alapetite 12 years ago
parent
commit
632423d97c
4 changed files with 5 additions and 7 deletions
  1. 1 1
      app/views/entry/bookmark.phtml
  2. 1 1
      app/views/entry/read.phtml
  3. 1 1
      lib/lib_rss.php
  4. 2 4
      public/scripts/main.js

+ 1 - 1
app/views/entry/bookmark.phtml

@@ -12,4 +12,4 @@ $url = Url::display (array (
 	'params' => Request::params (),
 ));
 
-echo json_encode (array ('url' => str_ireplace ('&', '&', $url)));
+echo json_encode (array ('url' => str_ireplace ('&', '&', $url), 'icon' => icon(Request::param ('is_favorite') ? 'non-starred' : 'starred')));

+ 1 - 1
app/views/entry/read.phtml

@@ -12,4 +12,4 @@ $url = Url::display (array (
 	'params' => Request::params (),
 ));
 
-echo json_encode (array ('url' => str_ireplace ('&', '&', $url)));
+echo json_encode (array ('url' => str_ireplace ('&', '&', $url), 'icon' => icon(Request::param ('is_read') ? 'unread' : 'read')));

+ 1 - 1
lib/lib_rss.php

@@ -216,7 +216,7 @@ function lazyimg($content) {
 	);
 }
 
-function icon($name) {	//<?php echo icon('share');
+function icon($name) {
 	static $alts = array(
 		'add' => '✚',
 		'all' => '☰',

+ 2 - 4
public/scripts/main.js

@@ -43,14 +43,13 @@ function mark_read(active, only_not_read) {
 			$r = active.find("a.read").attr("href", res.url),
 			inc = 0;
 		if (active.hasClass("not_read")) {
-			$r.find('.icon').removeClass('i_unread').addClass('i_read').text('☑');
 			active.removeClass("not_read");
 			inc--;
 		} else if (only_not_read !== true || active.hasClass("not_read")) {
-			$r.find('.icon').removeClass('i_read').addClass('i_unread').text('☐');
 			active.addClass("not_read");
 			inc++;
 		}
+		$r.find('.icon').replaceWith(res.icon);
 
 		//Update unread: feed
 		var feed_url = active.find(".website>a").attr("href"),
@@ -113,14 +112,13 @@ function mark_favorite(active) {
 			$b = active.find("a.bookmark").attr("href", res.url),
 			inc = 0;
 		if (active.hasClass("favorite")) {
-			$b.find('.icon').removeClass('i_starred').addClass('i_non-starred').text('☆');
 			active.removeClass("favorite");
 			inc--;
 		} else {
-			$b.find('.icon').removeClass('i_non-starred').addClass('i_starred').text('★');
 			active.addClass("favorite").find('.bookmark');
 			inc++;
 		}
+		$b.find('.icon').replaceWith(res.icon);
 
 		var favourites = $('.favorites>a').contents().last().get(0);
 		if (favourites && favourites.textContent) {