Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70745
Change subject: bugfixes: Ajax error handler, use correct data from web
request, setup parser
......................................................................
bugfixes: Ajax error handler, use correct data from web request, setup parser
* SF_autoedit.js: add handler for Ajax error
* SF_AutoeditAPI.php: merge correct data coming from the web request
* SF_AutoeditAPI.php: startExternalParse before actually using the parser
Change-Id: Iaa6142264e302fdbd508281499d65c96a16088ee
---
M includes/SF_AutoeditAPI.php
M libs/SF_autoedit.js
2 files changed, 19 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/45/70745/1
diff --git a/includes/SF_AutoeditAPI.php b/includes/SF_AutoeditAPI.php
index 1c2fc83..921986a 100644
--- a/includes/SF_AutoeditAPI.php
+++ b/includes/SF_AutoeditAPI.php
@@ -137,6 +137,13 @@
}
$this->mOptions = SFUtils::array_merge_recursive_distinct(
$data, $this->mOptions );
+ global $wgParser, $wgUser;
+ if ( $wgParser === null ) {
+ $wgParser = new Parser();
+ }
+
+ $wgParser->startExternalParse( null,
ParserOptions::newFromUser( $wgUser ), Parser::OT_WIKI );
+
// MW uses the parameter 'title' instead of 'target' when
submitting
// data for formedit action => use that
if ( !array_key_exists( 'target', $this->mOptions ) &&
array_key_exists( 'title', $this->mOptions ) ) {
@@ -323,7 +330,8 @@
'wpEdittime' => '',
'wpEditToken' => $wgUser->isLoggedIn()
? $wgUser->editToken() : EDIT_TOKEN_SUFFIX,
'action' => 'submit',
- ), $this->getRequest()->getValues()
+ ),
+ $this->mOptions
);
if ( array_key_exists( 'format', $data ) ) {
diff --git a/libs/SF_autoedit.js b/libs/SF_autoedit.js
index 3e2c4dd..42c7d92 100644
--- a/libs/SF_autoedit.js
+++ b/libs/SF_autoedit.js
@@ -61,7 +61,16 @@
jresult.removeClass(
'autoedit-result-wait' ).addClass( 'autoedit-result-error' );
jtrigger.removeClass(
'autoedit-trigger-wait' ).addClass( 'autoedit-trigger-error' );
}
- } // function to be called if the request succeeds
+ }, // function to be called if the request succeeds
+ error: function ( jqXHR, textStatus, errorThrown ){
+
+ var result = $.parseJSON( jqXHR.responseText );
+ jresult.empty().append( result.responseText );
+
+ jresult.removeClass( 'autoedit-result-wait'
).addClass( 'autoedit-result-error' );
+ jtrigger.removeClass( 'autoedit-trigger-wait'
).addClass( 'autoedit-trigger-error' );
+
+ } // function to be called if the request did not
succeed
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/70745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa6142264e302fdbd508281499d65c96a16088ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Foxtrott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
