John Bintz
2e2a746fe8
merve
2013-04-10 18:36:02 -04:00
John Bintz
7b8cd65a55
fix some slow javascript. oops
2013-04-10 18:34:47 -04:00
John Bintz
7f6d0c0eb3
Merge branch 'master' of git://github.com/nathanvda/cocoon into formtastic_input
2013-01-24 05:57:19 -05:00
Nathan Van der Auwera
d4f59eb5eb
Merge pull request #120 from virusman/rails4
...
Make sure javascript_expansions config option exists
2013-01-22 13:04:08 -08:00
virusman
de1acdf930
Make sure javascript_expansions config option exists
2013-01-23 00:33:44 +04:00
nathanvda
aac7105f04
Updated history.
2013-01-21 08:39:01 +01:00
nathanvda
c40d9becc3
Regenerate gemspec for version 1.1.2
2013-01-21 08:33:03 +01:00
nathanvda
bb6ffdbcdb
Version bump to 1.1.2
2013-01-21 08:32:52 +01:00
Nathan Van der Auwera
e4c3fe8023
Merge pull request #118 from ahmozkya/patch-1
...
Update app/assets/javascripts/cocoon.js
2013-01-20 23:30:04 -08:00
Ahmet Özkaya
33f5df9d4c
Update app/assets/javascripts/cocoon.js
...
".live()" method replaced by ".on()" (jQuery 1.7+) method
on jQuery 1.7 .live() method is deprecated
on jQuery 1.9 .live() method is removed
2013-01-19 23:48:02 +02:00
John Bintz
242d89a3b0
don't automaticaly include jquery ui
2013-01-15 21:55:31 -05:00
John Bintz
996ccd55f0
update for new jquery-ui-rails gem
2013-01-07 12:24:51 -05:00
John Bintz
d9e94ab3ed
remove console.logs, make orderling less specific, add turbolinks support
2012-12-13 18:51:47 -05:00
Nathan Van der Auwera
b40e73734c
Merge pull request #111 from andyw8/master
...
Fix broken TravisCI image
2012-12-13 10:40:19 -08:00
Andy Waite
7ce9fe91f3
Fix broken TravisCI image
2012-12-13 17:04:20 +00:00
John Bintz
0484ccbab5
Merge branch 'formtastic_input' of github.com:johnbintz/cocoon into formtastic_input
2012-12-10 20:52:42 -05:00
John Bintz
003229a558
input html options
2012-12-10 20:47:26 -05:00
John Bintz
6d85276a4e
add cocoon wrapper
2012-11-27 10:17:53 -05:00
nathanvda
a7a9147ad4
Version bump to 1.1.1
2012-11-22 01:33:45 +01:00
nathanvda
3c0c82ce90
Updated history.
2012-11-22 01:33:45 +01:00
nathanvda
ed8154d2fa
Added option :force_non_association_create.
...
This option will allow users to use `link_to_add_association`
in the nested fields loop, since it will not add
the new object to the association. Fixes #66 .
By default we will still create the object in the
association, as I believe that is the cleanest.
2012-11-22 01:33:45 +01:00
nathanvda
1c82d74acf
Merge remote-tracking branch 'origin/master'
2012-11-22 01:33:06 +01:00
nathanvda
2350ae3ba2
Regenerate gemspec for version 1.1.1
2012-11-22 01:32:33 +01:00
John Bintz
83beb92d4a
refactor and make i18n nicer
2012-11-01 13:19:36 -04:00
John Bintz
09fe15c446
fix broken test
2012-10-26 17:59:48 -04:00
John Bintz
a1715f049b
more work to make nested sortable forms work, can now sort forms within forms
2012-10-26 17:59:07 -04:00
John Bintz
511184a267
fix merge problem
2012-10-25 15:27:25 -04:00
John Bintz
b8f373fd5e
add the most basic sanity tests for formtastic input
2012-10-25 15:17:47 -04:00
John Bintz
042fcc9976
fix dumb bug
2012-10-25 15:02:00 -04:00
John Bintz
53074502b1
merge in master
2012-10-25 14:59:39 -04:00
John Bintz
6503f8eafa
merge
2012-10-25 14:51:07 -04:00
John Bintz
bfe72bd29f
add support for sorting nested forms
2012-10-25 14:49:55 -04:00
Nathan Van der Auwera
22cfa784d4
Clarified the :wrap_object documentation.
...
It was not made clear enough that the callable needs
to return the object. Fixes #103 .
2012-10-25 10:11:33 +03:00
John Bintz
215b31cb59
Merge branch 'formtastic_input' of github.com:johnbintz/cocoon into formtastic_input
2012-10-21 13:46:00 -04:00
John Bintz
663a9f344c
some fixes
2012-10-21 13:12:29 -04:00
nathanvda
2287dddcf9
Updated README to document the :wrap_object option and the changed callback signature (allowing to add animations, effects, markup to the inserted items).
2012-10-19 20:00:50 +02:00
John Bintz
f584e181d2
ensure important
2012-10-18 14:02:10 -04:00
nathanvda
bbba9dc4c0
Add the (to be) inserted or (to be) removed html to the event.
...
The event gets an extra parameter: for `before-insert` and `after-insert` the inserted piece of html. For `before-remove` and `after-remove` the removed piece of html. This way one can add effects/animations if needed.
The remove code has been refactored (less code duplication), and checks for a possible timeout, which can be set in the `before-remove` callback.
2012-10-18 07:28:29 +02:00
John Bintz
3f89fff364
add stylesheet for active admin integration
2012-10-17 11:21:19 -04:00
John Bintz
78b54a1002
hack in formtastic input
2012-10-17 10:09:53 -04:00
nathanvda
8118a45953
Make sure we handle self-nested forms correctly. Fixes #96 and #74 .
2012-10-13 00:11:16 +02:00
Nathan Van der Auwera
58f538f495
Merge pull request #98 from finist/patch-1
...
before and after remove triggers not work when fields existing
2012-10-12 07:19:15 -07:00
Nikolay Seskin
646c036258
Update app/assets/javascripts/cocoon.js
2012-10-12 17:54:55 +04:00
Nathan Van der Auwera
4f3fce0e9c
Regenerate gemspec for version 1.1.0
2012-10-09 01:13:46 +02:00
Nathan Van der Auwera
7e830eea2e
Update read me to reflect the new event names.
2012-09-25 00:47:41 +02:00
Nathan Van der Auwera
5d2446f7e5
Next release will be 1.1.0 because the event names have changed.
2012-09-25 00:03:20 +02:00
Nathan Van der Auwera
a5cc3212a7
Rename the events: use clear collision-free names.
2012-09-25 00:03:20 +02:00
Nathan Van der Auwera
64fd7e718d
Merge pull request #90 from dnagir/create-object-option
...
Allow to use with Arrays and non-associations
2012-09-24 14:28:04 -07:00
Dmytrii Nagirniak
4ad85f2782
Merge branch 'fix-broken-js' into create-object-option
2012-09-24 19:01:46 +10:00
Dmytrii Nagirniak
d4b997a082
Fix broken js at c69c157aff
2012-09-24 19:00:19 +10:00
