osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade font-awesome to version 4

Browse Source
This commit is contained in:
Neil Lalonde
2013-12-09 16:27:49 -05:00
parent 003ac02a67
commit ed3d3ae1e1
145 changed files with 1387 additions and 1919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/javascripts/components/home_logo_component_test.js
+1 -1
View File
@@ -2,7 +2,7 @@ var smallLogoUrl = "/assets/logo-single.png",
bigLogoUrl = "/assets/logo.png",
smallLogoSelector = "img.logo-small",
bigLogoSelector = "img#site-logo.logo-big",
homeIconSelector = "i.icon-home",
homeIconSelector = "i.fa-home",
headerSelector = "h2#site-text-logo.text-logo";
test/javascripts/lib/markdown_test.js
+1 -1
View File
@@ -320,7 +320,7 @@ test("Code Blocks", function() {
test("sanitize", function() {
var sanitize = Discourse.Markdown.sanitize;
equal(sanitize("<i class=\"icon-bug icon-spin\">bug</i>"), "<i>bug</i>");
equal(sanitize("<i class=\"fa-bug fa-spin\">bug</i>"), "<i>bug</i>");
equal(sanitize("<div><script>alert('hi');</script></div>"), "<div></div>");
equal(sanitize("<div><p class=\"funky\" wrong='1'>hello</p></div>"), "<div><p>hello</p></div>");
cooked("hello<script>alert(42)</script>", "<p>hello</p>", "it sanitizes while cooking");
test/javascripts/templates/search_test.js
+2 -2
View File
@@ -80,7 +80,7 @@ test("shows spinner icon instead of results area when loading", function() {
var $searchInProgress = fixture(searchInProgressSelector);
ok(exists($searchInProgress), "the 'search in progress' message is shown");
ok(exists($searchInProgress.find(".icon-spinner")), "the 'search in progress' message contains a spinner icon");
ok(exists($searchInProgress.find(".fa-spinner")), "the 'search in progress' message contains a spinner icon");
});
test("shows 'no results' message when loading has finished and there are no results found", function() {
@@ -173,5 +173,5 @@ test("displays 'close more results' button when the search is in the more result
var $firstSection = fixture(resultsSectionSelector).eq(0);
var $filter = $firstSection.find(resultsFilterSelector);
ok(exists($filter), "the 'close more results' button exists");
ok(exists($filter.find(".icon-remove-sign")), "the 'close more results' contains correct icon");
ok(exists($filter.find(".fa-times-circle")), "the 'close more results' contains correct icon");
});
test/javascripts/templates/site_map_test.js
+3 -3
View File
@@ -60,13 +60,13 @@ test("location links part is rendered correctly", function() {
ok(exists($adminLink), "a link to the admin section is present");
equal($adminLink.attr("href"), "/admin", "the link to the admin section points to a correct URL");
notEqual($adminLink.text().indexOf("admin_title"), -1, "the link to the admin section contains correct text");
ok(exists($adminLink.find(".icon-wrench")), "the link to the admin section contains correct icon");
ok(exists($adminLink.find(".fa-wrench")), "the link to the admin section contains correct icon");
var $flaggedPostsLink = $locationLinks.find(".flagged-posts-link");
ok(exists($flaggedPostsLink), "link to the flagged posts list is present");
equal($flaggedPostsLink.attr("href"), "/admin/flags/active", "the link to the flagged posts list points to a correct URL");
notEqual($flaggedPostsLink.text().indexOf("flags_title"), -1, "the link to the flagged posts list contains correct text");
ok(exists($flaggedPostsLink.find(".icon-flag")), "the link to the flagged posts list contains correct icon");
ok(exists($flaggedPostsLink.find(".fa-flag")), "the link to the flagged posts list contains correct icon");
var $flaggedPostsBadge = $locationLinks.find(".flagged-posts.badge-notification");
ok(exists($flaggedPostsBadge), "a flagged posts badge is present");
@@ -199,7 +199,7 @@ test("category links part is rendered correctly", function() {
ok($firstCategoryNewTopicsLink.hasClass("badge") && $firstCategoryNewTopicsLink.hasClass("badge-notification"), "the new topics link has correct classes");
equal($firstCategoryNewTopicsLink.attr("title"), "topic.new_topics 20", "the new topics link has correct title");
notEqual($firstCategoryNewTopicsLink.text().indexOf("20"), -1, "the new topics link contains correct text");
ok(exists($firstCategoryNewTopicsLink.find(".icon-asterisk")), "the new topics link contains correct icon");
ok(exists($firstCategoryNewTopicsLink.find(".fa-asterisk")), "the new topics link contains correct icon");
var $firstCategoryAllTopicsCount = $categories.first().find(".topics-count");
ok(!exists($firstCategoryAllTopicsCount), "the count of all topics is not shown");