Commit Graph

922 Commits

Author SHA1 Message Date
Kenn Jacobsen 7ee3cfca5c Merge pull request #378 from Nicholas-Westby/fix/372-drag-drop-broken
Fix for drag & drop failing when dropping fieldset in the same Archet…
2017-02-16 12:16:44 +01:00
Kenn Jacobsen e9b478c186 Fix #384
For some reason Umbraco has started lowercasing the names of uploaded
files. This fixes the problem by ignoring case when looking for the
uploaded files.
2017-02-15 11:17:01 +01:00
Nicholas-Westby 155355aa00 Fix for drag & drop failing when dropping fieldset in the same Archetype and the max fieldsets is reached: https://github.com/kgiszewski/Archetype/issues/372 2016-09-14 22:08:04 -07:00
kgiszewski abf6917b1c bump to v1.13.1 v1.13.1 2016-06-26 12:10:11 -04:00
kgiszewski 40ad701f7f Merge branch 'master' into pr/365 2016-06-26 12:05:18 -04:00
Kevin Giszewski a8113f926c Merge pull request #369 from kipusoep/master
Fixed #368
2016-06-16 16:21:21 -04:00
Kevin Giszewski 3c527396de Merge pull request #364 from Nicholas-Westby/fix/362-drag-fieldset-undefined
Fix for error during Archetype drags when there are rich text editors…
2016-06-16 16:12:33 -04:00
Stefan Kip 59bf66dcd1 Fixed #368 2016-06-16 20:11:02 +02:00
Nicholas-Westby c125042a86 Avoid fieldsets that can't be expanded: https://github.com/imulus/Archetype/issues/363 2016-05-20 21:38:39 -07:00
Nicholas-Westby 85ea472129 Fix for error during Archetype drags when there are rich text editors outside of Archetype: https://github.com/imulus/Archetype/issues/362 2016-05-18 20:03:05 -07:00
kgiszewski f541b50b82 Merge branch 'master' into pr/356
Conflicts:
	app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
	app/controllers/config.controller.js
	app/views/archetype.config.fieldset.dialog.html
v1.13.0
2016-05-13 10:07:18 -04:00
Nicholas-Westby 5767ea97d1 Workaround for .sortable("instance") not working on older versions of Umbraco. 2016-05-11 21:19:09 -07:00
Nicholas-Westby e1fa7a3271 Fixed recursion error and tidied up validation logic. 2016-05-07 15:48:39 -07:00
Nicholas-Westby c2e97e28ce Disable sortables for Archetypes that can't have the currently dragged fieldset dropped onto them. 2016-05-07 14:54:30 -07:00
Nicholas-Westby eda9bab02f Ensure the property alias is unique when dragging between Archetypes. 2016-05-07 12:45:34 -07:00
Nicholas-Westby ce3cecbec9 Fix for incorrect validation errors. 2016-05-05 21:52:03 -07:00
Nicholas-Westby ef5faae254 Allow the last fieldset to be dropped back to its origin list. 2016-05-05 21:18:08 -07:00
Nicholas-Westby 547473e92c Account for the possibility that the "tinyMCE" variable may not exist. 2016-05-05 20:20:44 -07:00
Nicholas-Westby 9857059906 Ensured the temporary ID is unique when cloning fieldsets. 2016-05-05 20:05:20 -07:00
Nicholas-Westby 7f7b054c14 Clear errors on the target Archetype too. 2016-05-04 21:28:16 -07:00
Nicholas-Westby a40d95250e Clear out errors of nested Archetypes on drop. 2016-05-04 21:15:36 -07:00
Nicholas-Westby 1e6004d3fa Another RTE fix.
Improved handling of validations when moving fieldsets (recursively mark Archetypes as valid).
2016-05-04 20:58:26 -07:00
Nicholas-Westby 0671403732 Fix for rich text editors when dragging between Archetypes. 2016-05-03 21:59:04 -07:00
kjac 8e00914370 More code style fixes 2016-05-03 20:17:45 +02:00
kjac 104c369bcc Fix some code style issues 2016-05-03 20:15:23 +02:00
kjac 4c02cf2921 Merge remote-tracking branch 'refs/remotes/origin/master' into allowed-member-groups 2016-05-03 19:44:59 +02:00
kjac 74470b8e8f Merge remote-tracking branch 'refs/remotes/imulus/master' 2016-05-03 19:44:23 +02:00
Nicholas-Westby de92147ec0 WIP: Attempting to fix RTE when dragging between fieldsets (still needs some work). 2016-05-01 21:23:02 -07:00
Nicholas-Westby c2b7d2c89d Allowed rich text editors to be dragged between Archetypes. 2016-05-01 18:27:01 -07:00
Nicholas-Westby d0fe30f08b WIP: Better handling of validation errors when dragging fieldsets between Archetypes.
Added "jsonSnapshot" (utility function for troubleshooting).
Added "tolerance" (my hope is that will help drag operations act nicer with expanded fieldsets).
2016-05-01 17:33:32 -07:00
Nicholas-Westby d22ae1244e Merge remote-tracking branch 'origin/master' into feature/355-nested-dragging 2016-04-30 18:18:14 -07:00
Nicholas-Westby fa48d73630 Only allow cross-Archetype sorting of a single fieldset if it can be removed. 2016-04-28 20:32:07 -07:00
kgiszewski fb305c9d0e Fix label padding in the config 2016-04-28 11:35:05 -04:00
Nicholas-Westby be332d310f Add a top margin of 5px to empty Archetype drop zone. 2016-04-28 08:24:06 -07:00
kjac d97bbb59dc Merge remote-tracking branch 'refs/remotes/origin/master' into allowed-member-groups 2016-04-27 21:00:11 +02:00
kjac 3702ec484b Merge remote-tracking branch 'refs/remotes/imulus/master' 2016-04-27 20:59:42 +02:00
Nicholas-Westby d8d4ec1a73 Improved terminology (fieldsets are dragged across Archetypes, not across fieldsets). 2016-04-27 08:21:16 -07:00
Nicholas-Westby 32cb89bba1 Made cross-field dragging opt-in. 2016-04-26 21:40:19 -07:00
Nicholas-Westby 863f041fc9 Fixed issue when dragging newly created fieldset between Archetypes.
Ensured that fieldset aliases are compared when judging compatibility during drag.
2016-04-26 21:14:33 -07:00
Nicholas-Westby 5a83719dfc Performance optimization via short-circuiting. 2016-04-26 05:57:08 -07:00
Nicholas-Westby 1b1940fe6a Tamed a rogue comment. 2016-04-26 05:54:56 -07:00
kgiszewski b71564bfb5 Merge branch 'pr/351' 2016-04-26 07:51:50 -04:00
kgiszewski ba8a6cf65c Merge branch 'master' into pr/351 2016-04-26 07:37:33 -04:00
Nicholas-Westby 7dd07b9f9c When dragging between Archetypes, only allow the operation when a configured fieldset matches the dragged fieldset. 2016-04-25 21:05:36 -07:00
Nicholas-Westby 29652bb880 Removed a parameter I never ended up using. 2016-04-24 21:54:05 -07:00
Nicholas-Westby 62b7420eaa Prevent dragging when can't add to or remove from list of fieldsets.
Allow dragging into an empty list of fieldsets.
2016-04-24 21:38:59 -07:00
Nicholas-Westby 333f17976b Enable nested dragging. 2016-04-24 17:57:36 -07:00
kjac 45981b0431 Handle lazy load of moment.js 2016-04-23 15:30:14 +02:00
kjac 531ff0aab4 Merge remote-tracking branch 'refs/remotes/origin/fix-publishing-for-collapsed-fieldsets' into allowed-member-groups
# Conflicts:
#	app/views/archetype.default.html
2016-04-23 15:25:33 +02:00
kjac 394572a8fc Yet another stab at fixing it
By tracking the fieldsets that have been expanded (loaded), we can make
sure the submit watchers fire appropriately, even when the fieldsets are
collapsed down again.

Apart from hopefully fixing the publishing issues for collapsed
fieldsets, this also adds a performance gain if the users expand and
collapse the same fieldsets more than once, since the fieldsets now only
load the first time they're expanded (instead of every time).

This also - at least partially - fixes the validation issue #325
introduced by #301
2016-04-23 10:14:56 +02:00