Merge branch 'master' into nested-items

Author: mtodd

.gitignore

@@ -6,6 +6,7 @@
 Gemfile.lock
 InstalledFiles
 _yardoc
+bin/
 coverage
 doc/
 lib/bundler/man
@@ -15,5 +16,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-components
+bower_components
 node_modules
+vendor/gems/

Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

app/assets/javascripts/task_lists.coffee

@@ -5,7 +5,6 @@
 #= provides tasklist:change
 #= provides tasklist:changed
 #
-#= require crema/element/fire
 #= require crema/events/pageupdate
 #
 # Enables Task List update behavior.
@@ -168,10 +167,13 @@ updateTaskList = ($item) ->
   index      = 1 + $container.find('.task-list-item-checkbox').index($item)
   checked    = $item.prop 'checked'
 
-  $field.fire 'tasklist:change', [index, checked], ->
+  event = $.Event 'tasklist:change'
+  $field.trigger event, [index, checked]
+
+  unless event.isDefaultPrevented()
     $field.val updateTaskListItem($field.val(), index, checked)
     $field.trigger 'change'
-    $field.fire 'tasklist:changed', [index, checked]
+    $field.trigger 'tasklist:changed', [index, checked]
 
 # When the task list item checkbox is updated, submit the change
 $(document).on 'change', '.task-list-item-checkbox', ->

bower.json

@@ -0,0 +1,8 @@
+{
+  "name": "task-lists",
+  "dependencies": {
+    "jquery": ">= 1.9.1",
+    "crema": "[email protected]:github/crema.git",
+    "qunit": ">= 1.0"
+  }
+}

config.ru

@@ -7,7 +7,7 @@ require 'sprockets'
 Root = File.expand_path("..", __FILE__)
 
 Assets = Sprockets::Environment.new(Root) do |env|
-  env.append_path "components" # bower
+  env.append_path "bower_components"
   env.append_path "app/assets/javascripts"
   env.append_path "app/assets/stylesheets"
   env.append_path "test"

lib/task_list/version.rb

@@ -1,3 +1,3 @@
 class TaskList
-  VERSION = [0, 1, 1].join('.')
+  VERSION = [0, 2, 1].join('.')
 end

script/bootstrap

@@ -10,6 +10,4 @@ if ! npm list bower 2>&1 | grep 0.8.5 >/dev/null; then
   npm install git://github.com/twitter/bower.git
 fi
 
-bower install --no-color jquery
-bower install --no-color https://hubot:[email protected]/github/crema.git
-bower install --no-color rails-behaviors
+bower install --no-color

script/cibuild

@@ -7,6 +7,10 @@
 cd $(dirname "$0")/..
 export PATH="$(pwd)/bin:$(pwd)/script:$(pwd)/node_modules/.bin:/usr/share/rbenv/shims:/opt/phantomjs/bin:/usr/share/nvm/0.8.11/bin:$PATH"
 
+# setup Ruby version
+if [ -d /usr/share/rbenv/shims ]; then export PATH=/usr/share/rbenv/shims:$PATH; fi
+export RBENV_VERSION="1.9.3-p231-tcs-github"
+
 # Write commit we're building at
 git log -n 1 || true
 echo
@@ -15,4 +19,4 @@ export DISPLAY=:99.0
 
 ./script/bootstrap
 ./script/testsuite 4018
-rake test
+bundle exec rake test

task-lists.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "html-pipeline"
 
+  gem.add_development_dependency "github-markdown"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "coffee-script"
   gem.add_development_dependency "json"
   gem.add_development_dependency "rack"
   gem.add_development_dependency "sprockets"
+  gem.add_development_dependency "minitest", "~> 5.3.2"
 end

test/functional/helpers/remote.coffee

@@ -1,3 +1,3 @@
 #= require jquery
-#= require rails/remote
+#= require rails-behaviors/remote
 #= require task_lists