Permalink
Browse files

buncha fixes

  • Loading branch information...
1 parent c22f2c0 commit bef854a13ef7f3e50becbaaf7b71256457f7d128 @jacquescrocker committed Mar 17, 2011
Showing with 15 additions and 15 deletions.
  1. +1 −0 .rvmrc
  2. +1 −0 Gemfile
  3. +5 −8 Gemfile.lock
  4. +1 −1 dynamic/misc/_navbar.erb
  5. +2 −2 dynamic/slides/_end.erb
  6. +5 −4 layouts/default.erb
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm 1.8.7@know1thing
View
@@ -1,3 +1,4 @@
source 'http://rubygems.org'
+gem "mongrel", ">= 1.2.0.pre2"
gem "frank", :git => "http://github.com/blahed/frank.git", :branch => "0.4.x"
# gem "frank", :path => "~/Gems/frank"
View
@@ -12,16 +12,12 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- cgi_multipart_eof_fix (2.5.0)
- daemons (1.1.0)
- fastthread (1.0.7)
+ daemons (1.0.10)
gem_plugin (0.2.3)
haml (3.0.16)
- mongrel (1.1.5)
- cgi_multipart_eof_fix (>= 2.4)
- daemons (>= 1.0.3)
- fastthread (>= 1.0.1)
- gem_plugin (>= 0.2.3)
+ mongrel (1.2.0.pre2)
+ daemons (~> 1.0.10)
+ gem_plugin (~> 0.2.3)
rack (1.2.1)
tilt (0.9)
@@ -30,3 +26,4 @@ PLATFORMS
DEPENDENCIES
frank!
+ mongrel (>= 1.2.0.pre2)
View
@@ -4,7 +4,7 @@
<a href="#" class="next">Next Slide</a>
<%= twitter_share :label => "Tweet this Slide",
- :url => "http://ifiwouldhaveknownjustonething.com##{slide}",
+ :url => "http://ifiwouldhaveknownjustonething.com/",
:text => "If I would have known just one thing... (by #{author_name})",
:via => defined?(author_twitter) ? author_twitter : nil,
:related => "sayhellothere,shanemacsays" %>
View
@@ -81,8 +81,8 @@
Source code for this slideshow is on <a href="http://github.com/railsjedi/know1thing">Github</a>
</p>
- <%# <p class="hellothere">
+ <p class="hellothere">
<a href="http://sayhellothere.com">Say Hello There</a> for your next job
- </p> %>
+ </p>
</div>
View
@@ -289,9 +289,9 @@
doc.addEventListener('touchend',
function(e) { _t.handleTouchEnd(e); }, false);
- window.addEventListener('popstate', function(e) {
- _t.go(e.state);
- }, false);
+ // window.addEventListener('popstate', function(e) {
+ // _t.go(e.state);
+ // }, false);
this._update();
};
@@ -317,7 +317,7 @@
nameToNumber: {},
numberToName: {},
next: function() {
- if (!this._slides[this.current-1].buildNext()) {
+ if (this._slides[this.current-1] && !this._slides[this.current-1].buildNext()) {
this.current = Math.min(this.current+1, this._slides.length);
this._update();
}
@@ -403,6 +403,7 @@
});
// Initialize
+ console.log(query(".slide"))
var slideshow = new SlideShow(query(".slide"), numberToName, nameToNumber);
$(".next").each(function() {

0 comments on commit bef854a

Please sign in to comment.