| Index: branches/wmf/1.17wmf1/includes/OutputPage.php |
| — | — | @@ -1686,6 +1686,7 @@ |
| 1687 | 1687 | // Add base resources |
| 1688 | 1688 | $this->addModules( array( 'mediawiki.legacy.wikibits' ) ); |
| 1689 | 1689 | $this->addModules( array( 'mediawiki.util' ) ); |
| | 1690 | + $this->addModules( array( 'mediawiki.page.startup' ) ); |
| 1690 | 1691 | |
| 1691 | 1692 | // Add various resources if required |
| 1692 | 1693 | if ( $wgUseAjax ) { |
| — | — | @@ -2261,7 +2262,7 @@ |
| 2262 | 2263 | $sk->setupUserCss( $this ); |
| 2263 | 2264 | |
| 2264 | 2265 | $lang = wfUILang(); |
| 2265 | | - $ret = Html::htmlHeader( array( 'lang' => $lang->getCode(), 'dir' => $lang->getDir() ) ); |
| | 2266 | + $ret = Html::htmlHeader( array( 'lang' => $lang->getCode(), 'dir' => $lang->getDir(), 'class' => 'client-nojs' ) ); |
| 2266 | 2267 | |
| 2267 | 2268 | if ( $this->getHTMLTitle() == '' ) { |
| 2268 | 2269 | $this->setHTMLTitle( wfMsg( 'pagetitle', $this->getPageTitle() ) ); |
| Property changes on: branches/wmf/1.17wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2269 | 2270 | Merged /trunk/phase3/includes/OutputPage.php:r95318,97962,98006 |
| Index: branches/wmf/1.17wmf1/resources/jquery/jquery.js |
| — | — | @@ -6237,4 +6237,16 @@ |
| 6238 | 6238 | // Expose jQuery to the global object |
| 6239 | 6239 | window.jQuery = window.$ = jQuery; |
| 6240 | 6240 | |
| | 6241 | +// HACK |
| | 6242 | +jQuery.fn.prop = jQuery.fn.attr; |
| | 6243 | +var oldData = jQuery.fn.data; |
| | 6244 | +jQuery.fn.data = function( key, value ) { |
| | 6245 | + if ( value === undefined ) { |
| | 6246 | + return this.attr( 'data-' + key ) || oldData( key, value ); |
| | 6247 | + } else { |
| | 6248 | + return oldData( key, value ); |
| | 6249 | + } |
| | 6250 | +}; |
| | 6251 | + |
| | 6252 | + |
| 6241 | 6253 | })(window); |
| Index: branches/wmf/1.17wmf1/resources/Resources.php |
| — | — | @@ -356,6 +356,13 @@ |
| 357 | 357 | 'mediawiki.action.view.rightClickEdit' => array( |
| 358 | 358 | 'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js', |
| 359 | 359 | ), |
| | 360 | + 'mediawiki.page.startup' => array( |
| | 361 | + 'scripts' => 'resources/mediawiki.page/mediawiki.page.startup.js', |
| | 362 | + 'dependencies' => array( |
| | 363 | + 'jquery.client', |
| | 364 | + ), |
| | 365 | + 'position' => 'top', |
| | 366 | + ), |
| 360 | 367 | 'mediawiki.special.preferences' => array( |
| 361 | 368 | 'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js', |
| 362 | 369 | 'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css', |
| Property changes on: branches/wmf/1.17wmf1/resources/Resources.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 363 | 370 | Merged /trunk/phase3/resources/Resources.php:r97962,98006 |
| Index: branches/wmf/1.17wmf1/resources/mediawiki.page/mediawiki.page.startup.js |
| — | — | @@ -0,0 +1,17 @@ |
| | 2 | +( function( $ ) { |
| | 3 | + |
| | 4 | + mw.page = {}; |
| | 5 | + |
| | 6 | + /* Client profile classes for <html> */ |
| | 7 | + |
| | 8 | + var prof = $.client.profile(); |
| | 9 | + $( 'html' ) |
| | 10 | + .addClass( |
| | 11 | + 'client-' + prof.name |
| | 12 | + + ' client-' + prof.name + '-' + prof.versionBase |
| | 13 | + + ' client-' + prof.layout |
| | 14 | + + ' client-' + prof.platform |
| | 15 | + + ' client-js' ) |
| | 16 | + .removeClass( 'client-nojs' ); |
| | 17 | + |
| | 18 | +} )( jQuery ); |
| Property changes on: branches/wmf/1.17wmf1/resources/mediawiki.page/mediawiki.page.startup.js |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 19 | + native |