Skip to content

Commit

Permalink
Remove usage of Textile
Browse files Browse the repository at this point in the history
  • Loading branch information
brymck committed Sep 20, 2015
1 parent eb3b85b commit 9ca1243
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 72 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ chrome/
firefox/
spec/js/*.js
spec/js/helpers/*.js
Gemfile.lock
*.png
*.xpi
*.zip
56 changes: 0 additions & 56 deletions Gemfile.lock

This file was deleted.

5 changes: 2 additions & 3 deletions src/_data/options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
checked: true
help: This option does not affect trolls you manually blacklist or whitelist,
just those with the auto tag
text: Hide trolls automatically based on
"remote list":http://www.brymck.com/reasonable/get
text: Hide trolls automatically based on <a href="http://www.brymck.com/reasonable/get">remote list</a>

- id: shareTrolls
checked: true
Expand All @@ -28,7 +27,7 @@
text: Show YouTube in comments

- id: showGravatar
text: Show ["Gravatar":http://en.gravatar.com/]/Identicon next to posters
text: Show <a href="http://en.gravatar.com/">Gravatar</a>/Identicon next to posters

- id: blockIframes
help: Facebook, Twitter and Google+ buttons all load their own mini-pages.
Expand Down
4 changes: 2 additions & 2 deletions src/manifest.json.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: reasonable
version: "2.3.3"
version: "2.3.4"
manifest_version: 2
description: For a site called reason, you'd think it would block trolls, help users
navigate comment threads, and show inline media. (Drink.)
Expand All @@ -12,7 +12,7 @@ icons:
page_action:
default_icon: /img/icon_16.png
default_title: reasonable
background:
background:
page: background.html
content_scripts:
- all_frames: true
Expand Down
14 changes: 3 additions & 11 deletions src/options.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,13 @@
%li{class: depth_class, title: option["help"]}<
- if option["type"].nil?
%input{id: option["id"], type: "checkbox", checked: option["checked"]}
%label{:for => option["id"]}
-# The extra space at the beginning of the text prevents
-# RedCloth from wrapping the output in <p> tags
:textile
#{option["text"]}
%label{:for => option["id"]} #{option["text"]}
- elsif option["type"] == "text"
%label{:for => option["id"]}
:textile
#{option["text"]}
%label{:for => option["id"]} #{option["text"]}
%input{id: option["id"], type: "text", placeholder: option["placeholder"]}
- elsif option["type"] == "range"
.range
%label{:for => option["id"]}
:textile
#{option["text"]}
%label{:for => option["id"]} #{option["text"]}
%br
%input{id: option["id"], type: "range", min: 1, max: 300}
%input.range_helper{id: "#{option["id"]}_helper", type: "number", min: 1, max: 300, size: 5}
Expand Down

0 comments on commit 9ca1243

Please sign in to comment.