Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200148
Change subject: Display submitted topic content
......................................................................
Display submitted topic content
For no-js, if content fails to submit (e.g. blocked by abusefilter),
it shouldn't be lost.
Change-Id: I1c7dc4dde239da0e25ee31263e0053eab3dc244a
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
M handlebars/flow_newtopic_form.partial.handlebars
3 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/48/200148/1
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index fae07bd..a5620dc 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -119,6 +119,7 @@
<input type="hidden" name="topiclist_replyTo"
value="'.htmlentities((string)((isset($in['workflowId']) && is_array($in)) ?
$in['workflowId'] : null), ENT_QUOTES, 'UTF-8').'" />
<input name="topiclist_topic" class="mw-ui-input
mw-ui-input-large"
required
+ '.((LCRun3::ifvar($cx,
((isset($in['submitted']['topic']) && is_array($in['submitted'])) ?
$in['submitted']['topic'] : null))) ?
'value="'.htmlentities((string)((isset($in['submitted']['topic']) &&
is_array($in['submitted'])) ? $in['submitted']['topic'] : null), ENT_QUOTES,
'UTF-8').'"' : '').'
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-start-placeholder'),array()), 'encq').'"
data-role="title"
@@ -133,7 +134,7 @@
placeholder="'.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-content-placeholder',((isset($cx['sp_vars']['root']['title'])
&& is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['title'] :
null)),array()), 'encq').'"
data-role="content"
required
- ></textarea>
+ >'.((LCRun3::ifvar($cx, ((isset($in['submitted']['content']) &&
is_array($in['submitted'])) ? $in['submitted']['content'] : null))) ?
''.htmlentities((string)((isset($in['submitted']['content']) &&
is_array($in['submitted'])) ? $in['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'' : '').'</textarea>
<div class="flow-form-actions flow-form-collapsible"
'.((LCRun3::ifvar($cx, ((isset($in['isOnFlowBoard']) &&
is_array($in)) ? $in['isOnFlowBoard'] : null))) ? 'style="display:none;"' :
'').'>
diff --git a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
index d2fced4..650b09c 100644
--- a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
@@ -57,6 +57,7 @@
<input type="hidden" name="topiclist_replyTo"
value="'.htmlentities((string)((isset($in['workflowId']) && is_array($in)) ?
$in['workflowId'] : null), ENT_QUOTES, 'UTF-8').'" />
<input name="topiclist_topic" class="mw-ui-input
mw-ui-input-large"
required
+ '.((LCRun3::ifvar($cx,
((isset($in['submitted']['topic']) && is_array($in['submitted'])) ?
$in['submitted']['topic'] : null))) ?
'value="'.htmlentities((string)((isset($in['submitted']['topic']) &&
is_array($in['submitted'])) ? $in['submitted']['topic'] : null), ENT_QUOTES,
'UTF-8').'"' : '').'
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-start-placeholder'),array()), 'encq').'"
data-role="title"
@@ -71,7 +72,7 @@
placeholder="'.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-content-placeholder',((isset($cx['sp_vars']['root']['title'])
&& is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['title'] :
null)),array()), 'encq').'"
data-role="content"
required
- ></textarea>
+ >'.((LCRun3::ifvar($cx, ((isset($in['submitted']['content']) &&
is_array($in['submitted'])) ? $in['submitted']['content'] : null))) ?
''.htmlentities((string)((isset($in['submitted']['content']) &&
is_array($in['submitted'])) ? $in['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'' : '').'</textarea>
<div class="flow-form-actions flow-form-collapsible"
'.((LCRun3::ifvar($cx, ((isset($in['isOnFlowBoard']) &&
is_array($in)) ? $in['isOnFlowBoard'] : null))) ? 'style="display:none;"' :
'').'>
diff --git a/handlebars/flow_newtopic_form.partial.handlebars
b/handlebars/flow_newtopic_form.partial.handlebars
index e988bd1..2858ce4 100644
--- a/handlebars/flow_newtopic_form.partial.handlebars
+++ b/handlebars/flow_newtopic_form.partial.handlebars
@@ -10,6 +10,7 @@
<input type="hidden" name="topiclist_replyTo" value="{{
workflowId }}" />
<input name="topiclist_topic" class="mw-ui-input
mw-ui-input-large"
required
+ {{#if
submitted.topic}}value="{{submitted.topic}}"{{/if}}
type="text"
placeholder="{{l10n "flow-newtopic-start-placeholder"}}"
data-role="title"
@@ -30,7 +31,9 @@
placeholder="{{l10n "flow-newtopic-content-placeholder"
@root.title}}"
data-role="content"
required
- ></textarea>
+ >
+ {{~#if
submitted.content~}}{{~submitted.content~}}{{~/if~}}
+ </textarea>
<div class="flow-form-actions flow-form-collapsible"
{{#if isOnFlowBoard}}style="display:none;"{{/if}}>
--
To view, visit https://gerrit.wikimedia.org/r/200148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c7dc4dde239da0e25ee31263e0053eab3dc244a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
