Merge "Use canonical parser option for linkupdate in api purge"

[lhc/web/wiklou.git] / resources / mediawiki / mediawiki.feedback.js

diff --git a/resources/mediawiki/mediawiki.feedback.js b/resources/mediawiki/mediawiki.feedback.js
index 3dce004..9a4a729 100644 (file)
--- a/resources/mediawiki/mediawiki.feedback.js
+++ b/resources/mediawiki/mediawiki.feedback.js
@@ -106,7 +106,7 @@
                                        $( '<div class="feedback-mode feedback-submitting" style="text-align:center;margin:3em 0;"></div>' ).append(
                                                mw.msg( 'feedback-adding' ),
                                                $( '<br/>' ),
-                                               $( '<img src="http://upload.wikimedia.org/wikipedia/commons/4/42/Loading.gif" />' )
+                                               $( '<span class="feedback-spinner"></span>' )
                                        ),
                                        $( '<div class="feedback-mode feedback-thanks" style="text-align:center;margin:1em"></div>' ).msg(
                                                'feedback-thanks', _this.title.getNameText(), $feedbackPageLink.clone()
@@ -180,8 +180,12 @@
                },
 
                displayError: function( message ) {
+                       var _this = this;
                        this.display( 'error' );
                        this.$dialog.find( '.feedback-error-msg' ).msg( message );
+                       var closeButton = {};
+                       closeButton[ mw.msg( 'feedback-close' ) ] = function() { _this.$dialog.dialog( 'close' ); };
+                       this.$dialog.dialog( { buttons: closeButton } );
                },
 
                cancel: function() {
@@ -210,12 +214,12 @@
                                                _this.displayError( 'feedback-error1' ); // unknown API result
                                        }
                                } else {
-                                       displayError( 'feedback-error2' ); // edit failed
+                                       _this.displayError( 'feedback-error2' ); // edit failed
                                }
                        };
 
                        var err = function( code, info ) {
-                               displayError( 'feedback-error3' ); // ajax request failed
+                               _this.displayError( 'feedback-error3' ); // ajax request failed
                        };
 
                        this.api.newSection( this.title, subject, message, ok, err );