Merge "API: Some raw message cleanup"

[lhc/web/wiklou.git] / resources / src / mediawiki.action / mediawiki.action.view.dblClickEdit.js

diff --git a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
index 2ded40c..2be29f0 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
@@ -4,9 +4,16 @@
 ( function ( mw, $ ) {
        $( function () {
                mw.util.$content.dblclick( function ( e ) {
-                       e.preventDefault();
-                       // Trigger native HTMLElement click instead of opening URL (bug 43052)
-                       $( '#ca-edit a' ).get( 0 ).click();
+                       // Recheck preference so extensions can do a hack to disable this code.
+                       if ( parseInt( mw.user.options.get( 'editondblclick' ), 10 ) ) {
+                               e.preventDefault();
+                               // Trigger native HTMLElement click instead of opening URL (bug 43052)
+                               var $a = $( '#ca-edit a' );
+                               // Not every page has an edit link (bug 57713)
+                               if ( $a.length ) {
+                                       $a.get( 0 ).click();
+                               }
+                       }
                } );
        } );
 }( mediaWiki, jQuery ) );