github-migration/cocoon
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
182 Commits 3 Branches 25 Tags 346 KiB
d4f59eb5eb
Commit Graph

182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Dmytrii Nagirniak
bee1a8ba0b Allow to build plural transient associations 2012-09-24 18:20:18 +10:00
Dmytrii Nagirniak
80f949d15a Allow to create association from build_xyz method on an object 2012-09-24 18:15:25 +10:00
Dmytrii Nagirniak
3f59065366 Refactor object creating and add pending spec 2012-09-24 18:08:07 +10:00
Dmytrii Nagirniak
a581d0a3ec Raise more describprive error when can't reflect on association 2012-09-24 17:47:47 +10:00
Nathan Van der Auwera
7baae8f8c3 Updated README. 2012-09-21 00:45:42 +02:00
Nathan Van der Auwera
8e3bfa1a29 Bump version to 1.0.23 2012-09-21 00:45:26 +02:00
Nathan Van der Auwera
c69c157aff Renamed the triggered events to be more clear and symmetric, and added a before-insert. As discussed in #89. 2012-09-21 00:38:26 +02:00
Nathan Van der Auwera
359e1ac741 Merge pull request #88 from SebastianEdwards/master 
Allow created objects to be decorated via a callable option.
 2012-09-20 02:21:48 -07:00
Sebastian Edwards
c33df6fec5 Allow created objects to be decorated via a callable option. 2012-09-19 22:37:35 +12:00
Nathan Van der Auwera
c2a0be513d Merge pull request #83 from porecreat/rename-template 
Rename link 'template' data attribute
 2012-09-13 05:17:55 -07:00
Nathan Van der Auwera
9c1451ec7a Merge pull request #76 from joelcogen/master 
Updated README with standard Rails forms example
 2012-09-13 05:16:32 -07:00
Nathan Van der Auwera
3cc8a56693 Merge pull request #82 from porecreat/master 
Relative node selection
 2012-09-13 05:15:24 -07:00
Gauthier Delacroix
5fb2708496 Fix data attributes order in specs 2012-08-29 10:42:15 +02:00
Gauthier Delacroix
9e3f0436d1 Rename JS 'template' data 2012-08-29 10:33:40 +02:00
Gauthier Delacroix
3833d9b175 Add relative node selection 2012-08-28 19:08:57 +02:00
Nathan Van der Auwera
6ebb375a67 Merge pull request #78 from ShaneCurcuru/patch-1 
Suggest attribution of Apache Cocoon trademark
 2012-08-01 07:30:46 -07:00
ShaneCurcuru
3b305ed389 Suggest attribution of Apache Cocoon trademark 2012-08-01 10:59:12 -03:00
Nathan Van der Auwera
ffaaaeefda Merge pull request #77 from DomKM/master 
This fork fixes a minor typo in README.markdown.
 2012-07-31 14:20:46 -07:00
Dom Kiva-Meyer
fd230a396d fixes minor typo in README 2012-07-31 11:36:30 -07:00
Joel Cogen
0cd06df780 Updated README with standard Rails forms example 2012-07-31 14:36:58 +03:00
Nathan Van der Auwera
c0fd78fea2 Merge pull request #75 from bduc/master 
Bugfix : Call insertion-callback on the correct container
 2012-07-30 08:39:19 -07:00
Bart Duchesne
a8e0a64ff0 call insertion-callback on the correct node (in case a specific insertion-node is specified) 2012-07-30 10:49:17 +02:00
Nathan Van der Auwera
9b61ab50a7 Merge pull request #72 from nick-desteffen/master 
Adding complete usage documentation for simple_form
 2012-07-14 01:31:51 -07:00