Modifications pour le document TemplateProviderMacros

Résumé

• Propriétés de la Page (2 modifications, 0 ajouts, 0 suppressions)
• Objets (2 modifications, 0 ajouts, 0 suppressions)
  • XWiki.JavaScriptExtension[0]
  • XWiki.StyleSheetExtension[0]

Détails

Propriétés de la Page

Auteur du document

...	...	@@ -1,1 +1,1 @@
1		-xwiki:XWiki.fcharton
	1	+XWiki.superadmin

Contenu

...	...	@@ -9,7 +9,9 @@
9	9	#else
10	10	#set ($output = $doc.display($property))
11	11	#end
12		- #unwrapXPropertyDisplay($output)
	12	+ #set ($output = $stringtool.removeStart($output, '{{html clean="false" wiki="false"}}'))
	13	+ #set ($output = $stringtool.removeEnd($output, '{{/html}}'))
	14	+ $output
13	13	#end
14	14
15	15	#macro (displayPathsPropertyValue $property)

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,4 +1,4 @@
1		-require(['jquery', 'xwiki-tree'], function($) {
	1	+require(['jquery', "$!services.webjars.url('org.xwiki.platform:xwiki-platform-tree-webjar', 'require-config.min.js', {'evaluate': true})"], function($) {
2	2	$('.paths').on('click', '.path-delete', function(event) {
3	3	event.preventDefault();
4	4	$(this).closest('.path').remove();
...	...	@@ -41,30 +41,32 @@
41	41	});
42	42
43	43	// Location Tree Picker
44		- $('.location-picker.modal').each(function() {
45		- var modal = $(this);
46		- var treeElement = modal.find('.location-tree');
47		- var selectButton = modal.find('.modal-footer .btn-primary');
	44	+ require(['tree'], function($) {
	45	+ $('.location-picker.modal').each(function() {
	46	+ var modal = $(this);
	47	+ var treeElement = modal.find('.location-tree');
	48	+ var selectButton = modal.find('.modal-footer .btn-primary');
48	48
49		- modal.on('shown.bs.modal', function(event) {
50		- if (!$.jstree.reference(treeElement)) {
51		- // Initialize the tree and hook the event listeners.
52		- treeElement.xtree({
53		- core: {
54		- multiple: true
55		- }
56		- }).on('changed.jstree', function(event, data) {
57		- selectButton.prop('disabled', !data.selected.length);
58		- }).on('dblclick', '.jstree-anchor', function() {
59		- selectButton.click();
60		- });
61		- }
62		- });
	50	+ modal.on('shown.bs.modal', function(event) {
	51	+ if (!$.jstree.reference(treeElement)) {
	52	+ // Initialize the tree and hook the event listeners.
	53	+ treeElement.xtree({
	54	+ core: {
	55	+ multiple: true
	56	+ }
	57	+ }).on('changed.jstree', function(event, data) {
	58	+ selectButton.prop('disabled', data.selected.size() === 0);
	59	+ }).on('dblclick', '.jstree-anchor', function() {
	60	+ selectButton.click();
	61	+ });
	62	+ }
	63	+ });
63	63
64		- selectButton.on('click', function() {
65		- modal.modal('hide');
66		- modal.triggerHandler('xwiki:locationTreePicker:select', {
67		- 'tree': $.jstree.reference(treeElement)
	65	+ selectButton.click(function() {
	66	+ modal.modal('hide');
	67	+ modal.triggerHandler('xwiki:locationTreePicker:select', {
	68	+ 'tree': $.jstree.reference(treeElement)
	69	+ });
68	68	});
69	69	});
70	70	});

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -17,7 +17,7 @@
17	17
18	18	.templateProviderSheet .paths .path-add {
19	19	border: 1px dashed $theme.borderColor;
20		- border-radius: 7px;
	20	+ border-radius: 4px;
21	21	cursor: pointer;
22	22	padding: 7px 15px;
23	23	}