Permalink
Browse files

Merge branch 'master' of github.com:water/mainline

  • Loading branch information...
2 parents aeedb5d + 2f26f8f commit 38e981b5b1ca9ef1e5bfe9e132f667343b90d045 @oleander oleander committed Mar 27, 2012
View
@@ -40,9 +40,9 @@ Core web application written in Rails 3
#### Ubuntu
-1. sudo apt-get install postgresql postgresql-server-dev-9.1
+1. `sudo apt-get install postgresql postgresql-server-dev-9.1`
2. Follow the Linux guidelines above about creating a user
-3. sudo /etc/init.d/postgresql restart
+3. `sudo service postgresql restart`
#### OS X
@@ -80,7 +80,7 @@ wrongly writes to stdin rather than stderr.
1. Migrate test database `RAILS_ENV=test bundle exec rake db:create db:migrate`
2. Start the DRb server ([spork](http://railscasts.com/episodes/285-spork)) by running `foreman start`.
3. Wait until it says *Spork is ready and listening on 8988!*, which takes about ~20 sec.
-4. Download fixtures using `git submodule init && git submodule update`
+4. Download fixtures using `git submodule update --init`
5. Run a test
- a specific test file `rspec spec/my_spec.rb`
- all specs `rspec spec/`
@@ -6,7 +6,7 @@ class Water.BreadcrumbSet extends Backbone.Model
# Take a path and constructs an array of breadcrumbs containing names and hrefs
set_path: (path) =>
- @path = path
+ @path = if path.length is 0 then path else (path + "/")
split_path = (path for path in path.split("/") when path)
@head = split_path.pop()
@crumbs = ({name: node, href: "#/tree/" + split_path[0..i].join("/")} for node, i in split_path)
@@ -17,10 +17,9 @@ class Water.CommitRequest extends Backbone.Model
uploadSuccessful: (options) =>
for pendingFile in @pendingFiles
if pendingFile.clientside_hash is options.hash
- @processedfiles.push(id: options.id, to: @breadcrumbs.path + "/" + pendingFile.filename)
+ @processedfiles.push(id: options.id, to: @breadcrumbs.path + pendingFile.filename)
@pendingFiles =
(pendingFile for pendingFile in @pendingFiles when pendingFile.clientside_hash isnt options.hash)
- console.log("CommitRequest says: files: ", @pendingFiles)
@checkStatus()
# Triggered when an upload is completed with an error.
@@ -59,7 +58,6 @@ class Water.CommitRequest extends Backbone.Model
@pendingFiles = []
@processedfiles = []
@errorFiles = []
- console.log("Shit was successful!!!!", data)
@trigger("commit_request_process_started")
commit_request_completed: () =>
@@ -84,7 +84,7 @@ $ ->
# and send them with the upload request
#
fileupload.bind("fileuploadsubmit", (e, data) =>
- hashes = (commit_request.addFile(file.fileName) for file in data.files)
+ hashes = (commit_request.addFile(file.name) for file in data.files)
data.formData = {hashes: JSON.stringify(hashes)}
)
@@ -14,7 +14,6 @@
= stylesheet_link_tag "water"
= yield :post_css
= javascript_include_tag "water"
- = javascript_include_tag "controllers/#{params[:controller]}"
= yield :post_js
%body{class: params[:controller]}
/[if lt IE 7] <p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p>
Oops, something went wrong.

0 comments on commit 38e981b

Please sign in to comment.