Permalink
Browse files

Update dependencies and refactor new feed view to avoid errors.

  • Loading branch information...
1 parent 9bf8268 commit ae9f37700b3d0091d3cb4eab8853d78cbd33a1c7 @tristandunn committed Dec 6, 2012
View
14 Gemfile
@@ -1,18 +1,18 @@
source "http://rubygems.org"
-gem "rails", "3.2.2"
-gem "thin", "1.3.1"
+gem "rails", "3.2.9"
+gem "thin", "1.5.0"
group :assets do
- gem "closure-compiler", "1.1.6"
- gem "bourbon", "1.4.0"
- gem "ejs", "1.0.0"
+ gem "closure-compiler", "1.1.7"
+ gem "bourbon", "2.1.3"
+ gem "ejs", "1.1.1"
gem "sass-rails", "3.2.5"
gem "yui-compressor", "0.9.6"
end
group :test do
- gem "capybara-webkit", "0.11.0"
+ gem "capybara-webkit", "0.13.0"
gem "cucumber-rails", "1.3.0", require: false
- gem "rspec-rails", "2.9.0"
+ gem "rspec-rails", "2.12.0"
end
View
@@ -5,145 +5,148 @@ GEM
Platform (>= 0.4.0)
open4
Platform (0.4.0)
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
+ mail (~> 2.4.4)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
+ activeresource (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
+ addressable (2.3.2)
arel (3.0.2)
- bourbon (1.4.0)
- sass (>= 3.1)
- builder (3.0.0)
- capybara (1.1.2)
+ bourbon (2.1.3)
+ sass (>= 3.2)
+ thor
+ builder (3.0.4)
+ capybara (1.1.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- capybara-webkit (0.11.0)
+ capybara-webkit (0.13.0)
capybara (>= 1.0.0, < 1.2)
json
- childprocess (0.3.1)
- ffi (~> 1.0.6)
- closure-compiler (1.1.6)
- cucumber (1.1.9)
+ childprocess (0.3.6)
+ ffi (~> 1.0, >= 1.0.6)
+ closure-compiler (1.1.7)
+ cucumber (1.2.1)
builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.9.0)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.11.0)
json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
cucumber-rails (1.3.0)
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
- daemons (1.1.8)
+ daemons (1.1.9)
diff-lcs (1.1.3)
- ejs (1.0.0)
+ ejs (1.1.1)
erubis (2.7.0)
- eventmachine (0.12.10)
- ffi (1.0.11)
- gherkin (2.9.3)
+ eventmachine (1.0.0)
+ ffi (1.2.0)
+ gherkin (2.11.5)
json (>= 1.4.6)
hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.3)
- json (1.6.6)
+ i18n (0.6.1)
+ journey (1.0.4)
+ json (1.7.5)
+ libwebsocket (0.1.7.1)
+ addressable
+ websocket
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.18)
- multi_json (1.2.0)
- nokogiri (1.5.2)
+ mime-types (1.19)
+ multi_json (1.4.0)
+ nokogiri (1.5.5)
open4 (1.3.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
+ rails (3.2.9)
+ actionmailer (= 3.2.9)
+ actionpack (= 3.2.9)
+ activerecord (= 3.2.9)
+ activeresource (= 3.2.9)
+ activesupport (= 3.2.9)
bundler (~> 1.0)
- railties (= 3.2.2)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
+ railties (= 3.2.9)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
+ thor (>= 0.14.6, < 2.0)
+ rake (10.0.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.0)
+ rspec-core (2.12.1)
+ rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- rspec-rails (2.9.0)
+ rspec-mocks (2.12.0)
+ rspec-rails (2.12.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.9.0)
- rubyzip (0.9.6.1)
- sass (3.1.15)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rubyzip (0.9.9)
+ sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.20.0)
+ selenium-webdriver (2.26.0)
childprocess (>= 0.2.5)
- ffi (~> 1.0)
+ libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sprockets (2.1.2)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- term-ansicolor (1.0.7)
- thin (1.3.1)
+ thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.14.6)
+ thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.32)
+ tzinfo (0.3.35)
+ websocket (1.0.4)
xpath (0.1.4)
nokogiri (~> 1.3)
yui-compressor (0.9.6)
@@ -153,13 +156,13 @@ PLATFORMS
ruby
DEPENDENCIES
- bourbon (= 1.4.0)
- capybara-webkit (= 0.11.0)
- closure-compiler (= 1.1.6)
+ bourbon (= 2.1.3)
+ capybara-webkit (= 0.13.0)
+ closure-compiler (= 1.1.7)
cucumber-rails (= 1.3.0)
- ejs (= 1.0.0)
- rails (= 3.2.2)
- rspec-rails (= 2.9.0)
+ ejs (= 1.1.1)
+ rails (= 3.2.9)
+ rspec-rails (= 2.12.0)
sass-rails (= 3.2.5)
- thin (= 1.3.1)
+ thin (= 1.5.0)
yui-compressor (= 0.9.6)
@@ -8,7 +8,7 @@ Reading.Views.Feeds.New = Backbone.View.extend({
keydown: function(event) {
if (event.keyCode == 27) {
- this.remove();
+ this.toggle();
return false;
}
@@ -31,17 +31,17 @@ Reading.Views.Feeds.New = Backbone.View.extend({
return input.addClass("error");
}
- this.remove();
+ this.toggle();
}, this));
return false;
},
toggle: function() {
- if ($(this.el).parent().size()) {
- this.remove();
- } else {
+ if ($(this.el).parent().size() === 0) {
this.render();
}
+
+ $(this.el).toggle();
}
});
@@ -247,6 +247,7 @@ body > header {
#feeds-new {
@include position(absolute, 50px 0 0 178px);
+ display: none;
z-index: 8;
section {
Oops, something went wrong.

0 comments on commit ae9f377

Please sign in to comment.