Skip to content
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Commit 3b587d2

Browse files
committed
Merge pull request #19 from github/fire-args-deprecated
Replace deprecated calls to $.fn.fire with $.fn.trigger
2 parents f345d13 + cf3eed4 commit 3b587d2

File tree

8 files changed

+12
-9
lines changed

8 files changed

+12
-9
lines changed

app/assets/javascripts/task_lists.coffee

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#= provides tasklist:change
66
#= provides tasklist:changed
77
#
8-
#= require crema/events/fire
98
#= require crema/events/pageupdate
109
#
1110
# Enables Task List update behavior.
@@ -168,10 +167,13 @@ updateTaskList = ($item) ->
168167
index = 1 + $container.find('.task-list-item-checkbox').index($item)
169168
checked = $item.prop 'checked'
170169

171-
$field.fire 'tasklist:change', [index, checked], ->
170+
event = $.Event 'tasklist:change'
171+
$field.trigger event, [index, checked]
172+
173+
unless event.isDefaultPrevented()
172174
$field.val updateTaskListItem($field.val(), index, checked)
173175
$field.trigger 'change'
174-
$field.fire 'tasklist:changed', [index, checked]
176+
$field.trigger 'tasklist:changed', [index, checked]
175177

176178
# When the task list item checkbox is updated, submit the change
177179
$(document).on 'change', '.task-list-item-checkbox', ->

lib/task_list/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
class TaskList
2-
VERSION = [0, 2, 0].join('.')
2+
VERSION = [0, 2, 1].join('.')
33
end

task-lists.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
2424
gem.add_development_dependency "json"
2525
gem.add_development_dependency "rack"
2626
gem.add_development_dependency "sprockets"
27+
gem.add_development_dependency "minitest", "~> 5.3.2"
2728
end
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#= require jquery
2-
#= require rails/remote
2+
#= require rails-behaviors/remote
33
#= require task_lists

test/task_list/filter_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require File.expand_path('../../test_helper', __FILE__)
33
require 'task_list/filter'
44

5-
class TaskList::FilterTest < Test::Unit::TestCase
5+
class TaskList::FilterTest < Minitest::Test
66
def setup
77
@pipeline = HTML::Pipeline.new [
88
HTML::Pipeline::MarkdownFilter,

test/task_list/summary_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require File.expand_path('../../test_helper', __FILE__)
33
require 'task_list/summary'
44

5-
class TaskList::SummaryTest < Test::Unit::TestCase
5+
class TaskList::SummaryTest < Minitest::Test
66
def setup
77
@complete = make_item "[x]", "complete"
88
@incomplete = make_item "[ ]", "incomplete"

test/task_list_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'task_list'
44
require 'task_list/filter'
55

6-
class TaskListTest < Test::Unit::TestCase
6+
class TaskListTest < Minitest::Test
77
class Record < Struct.new(:body)
88
def task_list_items
99
[]

test/test_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
$:.unshift "lib"
2-
require 'test/unit'
2+
require 'minitest/autorun'
33
require 'task_list'

0 commit comments

Comments
 (0)