Changes for page Message Sender Macro

Summary

• Objects (4 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]
  • XWiki.StyleSheetExtension[0]
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[2]

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,10 +1,9 @@
1	1	var XWiki = (function (XWiki) {
2	2	// Start XWiki augmentation.
3	3	XWiki.MessageStream = Class.create({
4		- initialize : function(container) {
5		- container = container || $(document.body);
6		- this.prepareForms(container);
7		- this.enhanceSelect(container);
	4	+ initialize : function() {
	5	+ this.prepareForms();
	6	+ this.enhanceSelect();
8	8	},
9	9	prepareTargetInput : function(event, element) {
10	10	var targetType = element.options[element.selectedIndex].value;
...	...	@@ -31,14 +31,14 @@
31	31	}
32	32	});
33	33	},
34		- enhanceSelect: function (container) {
35		- container.select('.messagestream select[name="visibilityLevel"]').each(function(element) {
	33	+ enhanceSelect: function () {
	34	+ $$('.messagestream select[name="visibilityLevel"]').each(function(element) {
36	36	element.observe('change', this.prepareTargetInput.bindAsEventListener(this, element));
37	37	this.prepareTargetInput(null, element);
38	38	}.bind(this));
39	39	},
40		- prepareForms: function(container) {
41		- container.select('.messagestream form').each(function(msForm) {
	39	+ prepareForms: function() {
	40	+ $$('.messagestream form').each(function(msForm) {
42	42	msForm.action = msForm.action.replace(/xredirect=.*$/, 'xpage=plain')
43	43	msForm.observe('submit', function(event) {
44	44	event.stop();
...	...	@@ -64,7 +64,12 @@
64	64	document.fire('xwiki:activity:newActivity', msForm);
65	65	},
66	66	onFailure: function(response) {
67		- var failureReason = response.statusText || 'Server not responding';
	66	+ var failureReason = '';
	67	+ if (response.statusText == '' /* No response */ || response.status == 12031 /* In IE */) {
	68	+ failureReason = 'Server not responding';
	69	+ } else {
	70	+ failureReason = response.statusText;
	71	+ }
68	68	if (msForm) {
69	69	msForm._disabled = false
70	70	if (msForm._notification) {
...	...	@@ -73,6 +73,9 @@
73	73	msForm._notification = new XWiki.widgets.Notification("$services.localization.render('xe.activity.messages.submit.failed'): " + failureReason, 'error');
74	74	}
75	75	},
	80	+ on1223 : function(response) { /*SUCCESS*/
	81	+ response.request.options.onSuccess(response);
	82	+ },
76	76	on0 : function(response) { /*FAILURE*/
77	77	response.request.options.onFailure(response);
78	78	},
...	...	@@ -86,21 +86,11 @@
86	86	}
87	87	});
88	88
89		-var init = function (event) {
90		- var elements = (event && event.memo.elements) || [$(document.body)];
91		- elements.forEach(function(container) {
92		- new XWiki.MessageStream(container);
93		- });
94		- return true;
	96	+var init = function() {
	97	+ return new XWiki.MessageStream();
95	95	};
	99	+(XWiki.domIsLoaded && init()) || document.observe('xwiki:dom:loaded', init);
96	96
97		-// Initialize the message sender macro when the page is loaded.
98		-(XWiki.domIsLoaded && init())
99		-|| document.observe('xwiki:dom:loaded', init);
100		-
101		-// Initialize the message sender macro when it is added after the page is loaded.
102		-document.observe('xwiki:dom:updated', init);
103		-
104	104	// End XWiki augmentation.
105	105	return XWiki;
106	106	}(XWiki || {}));

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,5 +3,3 @@
1		-#template('colorThemeInit.vm')
2		-
3	3	.messagestream-tools {
4	4	display: flex;
5	5	position: relative;
...	...	@@ -12,37 +12,3 @@
12	12	flex-grow: 1;
13	13	margin-left: .3em;
14	14	}
15		-
16		-.messagestream .message-content {
17		- padding: .5em 0 .5em 75px;
18		-}
19		-
20		-.messagestream .activitySnapshot {
21		- height: 30px;
22		- margin: 5px 0 0 -50px;
23		- position: absolute;
24		-}
25		-
26		-.messagestream .activitySnapshot img {
27		- border-radius: 10px 10px 0 10px;
28		- box-shadow: -1px 1px 1px rgba(128,128,128,0.6);
29		-}
30		-
31		-/* User's avatar */
32		-.messagestream .activitySnapshot .avatar {
33		- border-radius: 4px;
34		- box-shadow: 0 0 2px 1px rgba(128,128,128,0.6);
35		-}
36		-
37		-.messagestream .activitySnapshot .activityActionAvatar {
38		- background: $theme.pageContentBackgroundColor;
39		- border-color: $theme.pageContentBackgroundColor;
40		- border-style: solid;
41		- border-width: 4px 1px 1px 3px;
42		- box-sizing: content-box;
43		- bottom: -5px;
44		- height: 16px;
45		- position: absolute;
46		- right: -10px;
47		- width: 16px;
48		-}

Parse content

...	...	@@ -1,1 +1,1 @@
1		-Yes
	1	+No

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -32,6 +32,7 @@
32	32	##
33	33	## Skin Extensions
34	34	##--------------------------------------------------------------
	35	+#set ($discard = $xwiki.ssx.use('Main.Activity'))
35	35	#set ($discard = $xwiki.ssx.use('Main.MessageSenderMacro'))
36	36	#set ($discard = $xwiki.jsx.use('Main.MessageSenderMacro'))
37	37	{{/velocity}}
...	...	@@ -110,11 +110,11 @@
110	110	#set ($actionQueryString = "xredirect=$escapetool.url($xredirect)")
111	111	{{html}}
112	112	## Wrap the form in a div so that the layout is preserved in inline mode (where the form is stripped by the rendering).
113		- <div class='messagestream xform'>
	114	+ <div class='messagestream activityUser xform'>
114	114	#if (!$inEditMode)
115	115	<form action="${xwiki.getURL('Main.MessageSenderMacro', 'view', $!{actionQueryString})}" method='post'>
116	116	#end
117		- <div class='message-content'>
	118	+ <div class='activityContent'>
118	118	#if(!$inEditMode)
119	119	## CSRF prevention
120	120	<input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />

XWiki.WikiMacroParameterClass[2]

Parameter description

...	...	@@ -1,3 +1,3 @@
1	1	Comma separated list of visibility options that the macro should allow the user to choose from.
2	2
3		-This list should be a sublist of the default ones: 'everyone', 'followers', 'group', 'user'.
	3	+This list should be a sublist of the defualt ones: 'everyone', 'followers', 'group', 'user'.