[MediaWiki-commits] [Gerrit] Use postWithEditToken to make the reset transcode request - change (mediawiki...TimedMediaHandler)

2014-11-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use postWithEditToken to make the reset transcode request
..


Use postWithEditToken to make the reset transcode request

Change-Id: Ie1aef55e40150a91ddd24fa3121de1a6e8a8a86e
---
M TimedMediaHandler.hooks.php
M resources/ext.tmh.transcodetable.js
2 files changed, 6 insertions(+), 8 deletions(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 7ab2230..a403e05 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -72,6 +72,7 @@
'ext.tmh.transcodetable' = $baseExtensionResource + 
array(
'scripts' = 
'resources/ext.tmh.transcodetable.js',
'styles' = 'resources/transcodeTable.css',
+   'dependencies' = 'mw.api.edit',
'messages'= array(
'mwe-ok',
'mwe-cancel',
diff --git a/resources/ext.tmh.transcodetable.js 
b/resources/ext.tmh.transcodetable.js
index ed0e901..346c78f 100644
--- a/resources/ext.tmh.transcodetable.js
+++ b/resources/ext.tmh.transcodetable.js
@@ -50,15 +50,12 @@
 
$( this ).loadingSpinner();
 
-   var apiUrl =  mw.config.get( 'wgServer' ) + 
mw.config.get( 'wgScriptPath' ) + '/api.php';
-   // Do an api post action:
-   $.post( apiUrl, {
+   var api = new mw.Api();
+   api.postWithEditToken( {
'action' : 'transcodereset',
'transcodekey' : tKey,
-   'title' : mw.config.get('wgPageName'),
-   'token' : mw.user.tokens.get('editToken'),
-   'format' : 'json'
-   }, function ( data ) {
+   'title' : mw.config.get('wgPageName')
+   } ).done( function ( data ) {
if( data  data['success'] ){
// refresh the page
window.location.reload();
@@ -72,7 +69,7 @@
okBtn[ mw.msg('mwe-ok') ] = function() 
{ $(this).dialog( 'close' ); }
$( _thisDialog ).dialog( 'option', 
'buttons', okBtn );
}
-   })
+   } );
};
buttons[ mw.msg( 'mwe-cancel' ) ] = function () {
$( this ).dialog( 'close' );

-- 
To view, visit https://gerrit.wikimedia.org/r/173537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1aef55e40150a91ddd24fa3121de1a6e8a8a86e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use postWithEditToken to make the reset transcode request - change (mediawiki...TimedMediaHandler)

2014-11-15 Thread TheDJ (Code Review) 
TheDJ has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173537

Change subject: Use postWithEditToken to make the reset transcode request
..

Use postWithEditToken to make the reset transcode request

Change-Id: Ie1aef55e40150a91ddd24fa3121de1a6e8a8a86e
---
M TimedMediaHandler.hooks.php
M resources/ext.tmh.transcodetable.js
2 files changed, 6 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/37/173537/1

diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 7ab2230..a403e05 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -72,6 +72,7 @@
'ext.tmh.transcodetable' = $baseExtensionResource + 
array(
'scripts' = 
'resources/ext.tmh.transcodetable.js',
'styles' = 'resources/transcodeTable.css',
+   'dependencies' = 'mw.api.edit',
'messages'= array(
'mwe-ok',
'mwe-cancel',
diff --git a/resources/ext.tmh.transcodetable.js 
b/resources/ext.tmh.transcodetable.js
index ed0e901..346c78f 100644
--- a/resources/ext.tmh.transcodetable.js
+++ b/resources/ext.tmh.transcodetable.js
@@ -50,15 +50,12 @@
 
$( this ).loadingSpinner();
 
-   var apiUrl =  mw.config.get( 'wgServer' ) + 
mw.config.get( 'wgScriptPath' ) + '/api.php';
-   // Do an api post action:
-   $.post( apiUrl, {
+   var api = new mw.Api();
+   api.postWithEditToken( {
'action' : 'transcodereset',
'transcodekey' : tKey,
-   'title' : mw.config.get('wgPageName'),
-   'token' : mw.user.tokens.get('editToken'),
-   'format' : 'json'
-   }, function ( data ) {
+   'title' : mw.config.get('wgPageName')
+   } ).done( function ( data ) {
if( data  data['success'] ){
// refresh the page
window.location.reload();
@@ -72,7 +69,7 @@
okBtn[ mw.msg('mwe-ok') ] = function() 
{ $(this).dialog( 'close' ); }
$( _thisDialog ).dialog( 'option', 
'buttons', okBtn );
}
-   })
+   } );
};
buttons[ mw.msg( 'mwe-cancel' ) ] = function () {
$( this ).dialog( 'close' );

-- 
To view, visit https://gerrit.wikimedia.org/r/173537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1aef55e40150a91ddd24fa3121de1a6e8a8a86e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits