Skip to content
Browse files

Fixed document & js

  • Loading branch information...
1 parent 5c17bb0 commit c4d9116d8e89a1b45232b77cbcaf89425eebdec9 @yayugu committed Jul 11, 2014
Showing with 43 additions and 45 deletions.
  1. +1 −1 Gemfile
  2. +38 −40 Gemfile.lock
  3. +2 −2 app/views/main/_bookmarklet.js.erb
  4. +2 −2 app/views/main/index.html.slim
View
2 Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
ruby '2.0.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.2'
+gem 'rails', '4.0.8'
gem 'slim'
View
78 Gemfile.lock
@@ -1,32 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.0.2)
- actionpack (= 4.0.2)
+ actionmailer (4.0.8)
+ actionpack (= 4.0.8)
mail (~> 2.5.4)
- actionpack (4.0.2)
- activesupport (= 4.0.2)
+ actionpack (4.0.8)
+ activesupport (= 4.0.8)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- activemodel (4.0.2)
- activesupport (= 4.0.2)
+ activemodel (4.0.8)
+ activesupport (= 4.0.8)
builder (~> 3.1.0)
- activerecord (4.0.2)
- activemodel (= 4.0.2)
+ activerecord (4.0.8)
+ activemodel (= 4.0.8)
activerecord-deprecated_finders (~> 1.0.2)
- activesupport (= 4.0.2)
+ activesupport (= 4.0.8)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
- activesupport (4.0.2)
- i18n (~> 0.6, >= 0.6.4)
+ activesupport (4.0.8)
+ i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.2)
- atomic (1.1.14)
builder (3.1.4)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
@@ -36,13 +35,13 @@ GEM
execjs
coffee-script-source (1.7.0)
erubis (2.7.0)
- execjs (2.0.2)
+ execjs (2.2.1)
hike (1.2.3)
- i18n (0.6.9)
+ i18n (0.6.11)
jbuilder (1.5.3)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
- jquery-rails (3.1.0)
+ jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
@@ -51,61 +50,60 @@ GEM
treetop (~> 1.4.8)
mime-types (1.25.1)
minitest (4.7.5)
- multi_json (1.8.4)
- newrelic_rpm (3.7.2.195)
+ multi_json (1.10.1)
+ newrelic_rpm (3.9.0.229)
oauth (0.4.7)
pg (0.17.1)
- polyglot (0.3.3)
+ polyglot (0.3.5)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.0.2)
- actionmailer (= 4.0.2)
- actionpack (= 4.0.2)
- activerecord (= 4.0.2)
- activesupport (= 4.0.2)
+ rails (4.0.8)
+ actionmailer (= 4.0.8)
+ actionpack (= 4.0.8)
+ activerecord (= 4.0.8)
+ activesupport (= 4.0.8)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.0.2)
- sprockets-rails (~> 2.0.0)
+ railties (= 4.0.8)
+ sprockets-rails (~> 2.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
- railties (4.0.2)
- actionpack (= 4.0.2)
- activesupport (= 4.0.2)
+ railties (4.0.8)
+ actionpack (= 4.0.8)
+ activesupport (= 4.0.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.1.1)
+ rake (10.3.2)
rdoc (4.1.1)
json (~> 1.4)
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
- slim (2.0.2)
+ slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
- sprockets (2.10.1)
+ sprockets (2.12.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.0.1)
+ sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
- sqlite3 (1.3.8)
- temple (0.6.7)
- thor (0.18.1)
- thread_safe (0.1.3)
- atomic
+ sqlite3 (1.3.9)
+ temple (0.6.8)
+ thor (0.19.1)
+ thread_safe (0.3.4)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.38)
- uglifier (2.4.0)
+ tzinfo (0.3.39)
+ uglifier (2.5.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
@@ -119,7 +117,7 @@ DEPENDENCIES
newrelic_rpm
oauth
pg
- rails (= 4.0.2)
+ rails (= 4.0.8)
rails_12factor
sdoc
slim
View
4 app/views/main/_bookmarklet.js.erb
@@ -22,9 +22,9 @@ javascript:void(function(){
if (m = path.match(list_pattern)) {
return root_url +
'feed/list?name=' +
- m[0] +
- '&slug=' +
m[1] +
+ '&slug=' +
+ m[2] +
'&url_id_hash=' +
url_id_hash;
}
View
4 app/views/main/index.html.slim
@@ -5,8 +5,8 @@ div
div You can generate RSS with URL like:
ul
li #{root_url}feed/home?url_id_hash=#{@user.url_id_hash}
- li #{root_url}feed/user?user=USERNAME&url_id_hash=#{@user.url_id_hash}
- li #{root_url}feed/list?user=USERNAME&slug=LISTNAME&url_id_hash=#{@user.url_id_hash}
+ li #{root_url}feed/user?name=USERNAME&url_id_hash=#{@user.url_id_hash}
+ li #{root_url}feed/list?name=USERNAME&slug=LISTNAME&url_id_hash=#{@user.url_id_hash}
li #{root_url}feed/search?q=KEYWORD&url_id_hash=#{@user.url_id_hash}
div
| Bookmarklet is also available. →

0 comments on commit c4d9116

Please sign in to comment.
Something went wrong with that request. Please try again.