| Index: branches/REL1_17/extensions/Collection/Collection.php |
| — | — | @@ -154,10 +154,43 @@ |
| 155 | 155 | $wgHooks['SkinBuildSidebar'][] = 'CollectionHooks::buildSidebar'; |
| 156 | 156 | $wgHooks['SiteNoticeAfter'][] = 'CollectionHooks::siteNoticeAfter'; |
| 157 | 157 | $wgHooks['OutputPageCheckLastModified'][] = 'CollectionHooks::checkLastModified'; |
| | 158 | +$wgHooks['ResourceLoaderGetConfigVars'][] = 'CollectionHooks::resourceLoaderGetConfigVars'; |
| 158 | 159 | |
| 159 | 160 | $wgAvailableRights[] = 'collectionsaveasuserpage'; |
| 160 | 161 | $wgAvailableRights[] = 'collectionsaveascommunitypage'; |
| 161 | 162 | |
| | 163 | +$collResourceTemplate = array( |
| | 164 | + 'localBasePath' => "$dir/js", |
| | 165 | + 'remoteExtPath' => 'Collection/js' |
| | 166 | +); |
| | 167 | + |
| | 168 | +$wgResourceModules += array( |
| | 169 | + 'ext.collection.jquery.json' => $collResourceTemplate + array( |
| | 170 | + 'scripts' => 'jquery.json.js' |
| | 171 | + ), |
| | 172 | + 'ext.collection.jquery.jstorage' => $collResourceTemplate + array( |
| | 173 | + 'scripts' => 'jstorage.js', |
| | 174 | + 'dependencies' => 'ext.collection.jquery.json' |
| | 175 | + ), |
| | 176 | + 'ext.collection.suggest' => $collResourceTemplate + array( |
| | 177 | + 'scripts' => 'suggest.js', |
| | 178 | + 'dependencies' => 'ext.collection.bookcreator' |
| | 179 | + ), |
| | 180 | + 'ext.collection' => $collResourceTemplate + array( |
| | 181 | + 'scripts' => 'collection.js', |
| | 182 | + 'dependencies' => array( 'ext.collection.bookcreator', 'jquery.ui.sortable' ), |
| | 183 | + ), |
| | 184 | + 'ext.collection.bookcreator' => $collResourceTemplate + array( |
| | 185 | + 'scripts' => 'bookcreator.js', |
| | 186 | + 'styles' => 'bookcreator.css', |
| | 187 | + 'dependencies' => 'ext.collection.jquery.jstorage' |
| | 188 | + ), |
| | 189 | + 'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + array( |
| | 190 | + 'scripts' => 'check_load_from_localstorage.js', |
| | 191 | + 'dependencies' => 'ext.collection.jquery.jstorage' |
| | 192 | + ) |
| | 193 | +); |
| | 194 | + |
| 162 | 195 | # register global Ajax functions: |
| 163 | 196 | |
| 164 | 197 | function wfAjaxGetCollection() { |
| Index: branches/REL1_17/extensions/Collection/Collection.suggest.php |
| — | — | @@ -66,6 +66,7 @@ |
| 67 | 67 | |
| 68 | 68 | $template = self::getCollectionSuggestTemplate( $mode, $param ); |
| 69 | 69 | $wgOut->setPageTitle( wfMsg( 'coll-suggest_title' ) ); |
| | 70 | + $wgOut->addModules( 'ext.collection.suggest' ); |
| 70 | 71 | $wgOut->addTemplate( $template ); |
| 71 | 72 | } |
| 72 | 73 | |
| Index: branches/REL1_17/extensions/Collection/Collection.hooks.php |
| — | — | @@ -252,56 +252,11 @@ |
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | | - $html = Xml::element( 'script', |
| 257 | | - array( |
| 258 | | - 'type' => $wgJsMimeType, |
| 259 | | - 'src' => "$jsPath/jquery.js?$wgCollectionStyleVersion", |
| 260 | | - ), |
| 261 | | - '', false |
| 262 | | - ); |
| 263 | | - |
| 264 | | - $html .= Xml::element( 'script', |
| 265 | | - array( |
| 266 | | - 'type' => $wgJsMimeType, |
| 267 | | - 'src' => "$jsPath/jquery.json.js?$wgCollectionStyleVersion", |
| 268 | | - ), |
| 269 | | - '', false |
| 270 | | - ); |
| 271 | | - |
| 272 | | - $html .= Xml::element( 'script', |
| 273 | | - array( |
| 274 | | - 'type' => $wgJsMimeType, |
| 275 | | - 'src' => "$jsPath/jstorage.js?$wgCollectionStyleVersion", |
| 276 | | - ), |
| 277 | | - '', false |
| 278 | | - ); |
| 279 | | - |
| 280 | | - $html .= Xml::element( 'script', |
| 281 | | - array( |
| 282 | | - 'type' => $wgJsMimeType, |
| 283 | | - 'src' => "$jsPath/bookcreator.js?$wgCollectionStyleVersion", |
| 284 | | - ), |
| 285 | | - '', false |
| 286 | | - ); |
| 287 | | - $html .= Xml::element( 'style', |
| 288 | | - array( 'type' => 'text/css' ), |
| 289 | | - <<<EOS |
| 290 | | -#collectionpopup { |
| 291 | | - position: absolute; |
| 292 | | - padding: 4px; |
| 293 | | - border: 1px solid #000; |
| 294 | | - background-color: #fea; |
| 295 | | - z-index: 9999; |
| 296 | | - display: inline; |
| 297 | | - font-size: 10pt; |
| 298 | | -} |
| 299 | | -EOS |
| 300 | | - , false |
| 301 | | - ); |
| | 256 | + $wgOut->addModules( 'ext.collection.bookcreator' ); |
| 302 | 257 | |
| 303 | 258 | $addRemoveState = $mode; |
| 304 | 259 | |
| 305 | | - $html .= Xml::element( 'div', |
| | 260 | + $html = Xml::element( 'div', |
| 306 | 261 | array( 'style' => wfMsg( 'coll-book_creator_box_style' ) ), |
| 307 | 262 | null |
| 308 | 263 | ); |
| — | — | @@ -563,5 +518,13 @@ |
| 564 | 519 | } |
| 565 | 520 | return true; |
| 566 | 521 | } |
| | 522 | + |
| | 523 | + /** |
| | 524 | + * ResourceLoaderGetConfigVars hook |
| | 525 | + */ |
| | 526 | + static function resourceLoaderGetConfigVars( &$vars ) { |
| | 527 | + $vars['wgCollectionVersion'] = $GLOBALS['wgCollectionVersion']; |
| | 528 | + return true; |
| | 529 | + } |
| 567 | 530 | } |
| 568 | 531 | |
| Index: branches/REL1_17/extensions/Collection/js/bookcreator.css |
| — | — | @@ -0,0 +1,40 @@ |
| | 2 | +#collectionpopup { |
| | 3 | + position: absolute; |
| | 4 | + padding: 4px; |
| | 5 | + border: 1px solid #000; |
| | 6 | + background-color: #fea; |
| | 7 | + z-index: 9999; |
| | 8 | + display: inline; |
| | 9 | + font-size: 10pt; |
| | 10 | +} |
| | 11 | + |
| | 12 | +.collection-button { |
| | 13 | + float: left; |
| | 14 | + padding: 0 10px; |
| | 15 | + border: 1px solid #777; |
| | 16 | + -webkit-border-radius: 8px; |
| | 17 | + -moz-border-radius: 8px; |
| | 18 | +} |
| | 19 | + |
| | 20 | +.collection-button.ok { |
| | 21 | + /* @embed */ |
| | 22 | + background: url(../images/green-button-back.png) center no-repeat; |
| | 23 | + margin-right: 10px; |
| | 24 | +} |
| | 25 | + |
| | 26 | +.collection-button.cancel { |
| | 27 | + /* @embed */ |
| | 28 | + background: url(../images/red-button-back.png) center no-repeat; |
| | 29 | +} |
| | 30 | + |
| | 31 | +.collection-button a { |
| | 32 | + display: block; |
| | 33 | + color: #fff; |
| | 34 | + font-size: 1.1em; |
| | 35 | + font-weight: bold; |
| | 36 | + line-height: 1.8em; |
| | 37 | +} |
| | 38 | + |
| | 39 | +.collection-button a:hover { |
| | 40 | + text-decoration: none; |
| | 41 | +} |
| Property changes on: branches/REL1_17/extensions/Collection/js/bookcreator.css |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 42 | + native |
| Index: branches/REL1_17/extensions/Collection/js/collection.js |
| — | — | @@ -234,4 +234,4 @@ |
| 235 | 235 | } |
| 236 | 236 | }); |
| 237 | 237 | |
| 238 | | -})(collection_jQuery); |
| | 238 | +})(jQuery); |
| Index: branches/REL1_17/extensions/Collection/js/suggest.js |
| — | — | @@ -39,5 +39,5 @@ |
| 40 | 40 | |
| 41 | 41 | window.collectionSuggestCall = collectionSuggestCall; |
| 42 | 42 | |
| 43 | | -})(collection_jQuery); |
| | 43 | +})(jQuery); |
| 44 | 44 | |
| Index: branches/REL1_17/extensions/Collection/Collection.body.php |
| — | — | @@ -321,14 +321,7 @@ |
| 322 | 322 | $imagepath = "$wgScriptPath/extensions/Collection/images"; |
| 323 | 323 | $jspath = "$wgScriptPath/extensions/Collection/js"; |
| 324 | 324 | |
| 325 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$jspath/jquery.js?" . |
| 326 | | - "$wgCollectionStyleVersion\"></script>" ); |
| 327 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$jspath/jquery.json.js?" . |
| 328 | | - "$wgCollectionStyleVersion\"></script>" ); |
| 329 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$jspath/jstorage.js?" . |
| 330 | | - "$wgCollectionStyleVersion\"></script>" ); |
| 331 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$jspath/check_load_from_localstorage.js?" . |
| 332 | | - "$wgCollectionStyleVersion\"></script>" ); |
| | 325 | + $wgOut->addModules( 'ext.collection.checkLoadFromLocalStorage' ); |
| 333 | 326 | |
| 334 | 327 | $coll = CollectionSession::getCollection(); |
| 335 | 328 | $dialogtxt = wfMsg( 'coll-load_local_book' ); |
| — | — | @@ -338,40 +331,6 @@ |
| 339 | 332 | "var collection_dialogtxt = " . Xml::encodeJsVar( $dialogtxt ) . ";\n" . |
| 340 | 333 | "</script>" ); |
| 341 | 334 | |
| 342 | | - $wgOut->mScripts .= <<<EOS |
| 343 | | -<style type="text/css"> |
| 344 | | -.collection-button { |
| 345 | | - float: left; |
| 346 | | - padding: 0 10px; |
| 347 | | - border: 1px solid #777; |
| 348 | | - -webkit-border-radius: 8px; |
| 349 | | - -moz-border-radius: 8px; |
| 350 | | -} |
| 351 | | - |
| 352 | | -.collection-button.ok { |
| 353 | | - background: url($imagepath/green-button-back.png) center no-repeat; |
| 354 | | - margin-right: 10px; |
| 355 | | -} |
| 356 | | - |
| 357 | | -.collection-button.cancel { |
| 358 | | - background: url($imagepath/red-button-back.png) center no-repeat; |
| 359 | | -} |
| 360 | | - |
| 361 | | -.collection-button a { |
| 362 | | - display: block; |
| 363 | | - color: #fff; |
| 364 | | - font-size: 1.1em; |
| 365 | | - font-weight: bold; |
| 366 | | - line-height: 1.8em; |
| 367 | | -} |
| 368 | | - |
| 369 | | -.collection-button a:hover { |
| 370 | | - text-decoration: none; |
| 371 | | -} |
| 372 | | -</style> |
| 373 | | -EOS |
| 374 | | - ; |
| 375 | | - |
| 376 | 335 | $title = Title::newFromText( $referer ); |
| 377 | 336 | if ( is_null( $title ) || $title->equals( $wgTitle ) ) { |
| 378 | 337 | $title = Title::newMainPage(); |
| — | — | @@ -522,11 +481,7 @@ |
| 523 | 482 | |
| 524 | 483 | $this->setHeaders(); |
| 525 | 484 | $wgOut->setPageTitle( wfMsg( 'coll-manage_your_book' ) ); |
| 526 | | - $wgOut->addInlineScript( "var wgCollectionVersion = \"$wgCollectionVersion\";" ); |
| 527 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$jspath/jquery.js?$wgCollectionStyleVersion\"></script>" ); |
| 528 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$jspath/jquery.ui.js?$wgCollectionStyleVersion\"></script>" ); |
| 529 | | - $wgOut->addInlineScript( "var collection_jQuery = jQuery.noConflict();" ); |
| 530 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$jspath/collection.js?$wgCollectionStyleVersion\"></script>" ); |
| | 485 | + $wgOut->addModules( 'ext.collection' ); |
| 531 | 486 | |
| 532 | 487 | $template = new CollectionPageTemplate(); |
| 533 | 488 | $template->set( 'collection', CollectionSession::getCollection() ); |
| — | — | @@ -1101,10 +1056,7 @@ |
| 1102 | 1057 | $wgOut->addInlineScript( 'var collection_id = "' . urlencode( $response['collection_id'] ) . '";' ); |
| 1103 | 1058 | $wgOut->addInlineScript( 'var writer = "' . urlencode( $response['writer'] ) . '";' ); |
| 1104 | 1059 | $wgOut->addInlineScript( 'var collection_rendering = true;' ); |
| 1105 | | - $wgOut->addInlineScript( "var wgCollectionVersion = \"$wgCollectionVersion\";" ); |
| 1106 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$wgScriptPath/extensions/Collection/js/jquery.js?$wgCollectionStyleVersion\"></script>" ); |
| 1107 | | - $wgOut->addInlineScript( "var collection_jQuery = jQuery.noConflict();" ); |
| 1108 | | - $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$wgScriptPath/extensions/Collection/js/collection.js?$wgCollectionStyleVersion\"></script>" ); |
| | 1060 | + $wgOut->addModules( 'ext.collection' ); |
| 1109 | 1061 | $wgOut->setPageTitle( wfMsg( 'coll-rendering_title' ) ); |
| 1110 | 1062 | |
| 1111 | 1063 | if ( isset( $response['status']['status'] ) && $response['status']['status'] ) { |
| Index: branches/REL1_17/extensions/Collection/Collection.templates.php |
| — | — | @@ -446,13 +446,6 @@ |
| 447 | 447 | class CollectionSuggestTemplate extends QuickTemplate { |
| 448 | 448 | function execute () { |
| 449 | 449 | ?> |
| 450 | | -<script src="<?php echo htmlspecialchars( $GLOBALS['wgScriptPath'] . "/extensions/Collection/js/jquery.js?" . $GLOBALS['wgCollectionStyleVersion'] ) ?>" type="<?php echo $GLOBALS['wgJsMimeType']; ?>"></script> |
| 451 | | -<script type="<?php echo $GLOBALS['wgJsMimeType']; ?>"> |
| 452 | | -/*<![CDATA[*/ |
| 453 | | -var collection_jQuery = jQuery.noConflict(); |
| 454 | | -/*]]>*/ |
| 455 | | -</script> |
| 456 | | -<script src="<?php echo $GLOBALS['wgScriptPath'] . "/extensions/Collection/js/suggest.js?" . $GLOBALS['wgCollectionStyleVersion'] ?>" type="<?php echo $GLOBALS['wgJsMimeType']; ?>"></script> |
| 457 | 450 | <div> |
| 458 | 451 | <?php $this->msg( 'coll-suggest_intro_text' ) ?> |
| 459 | 452 | <div id="collectionSuggestStatus" style="text-align: center; margin: 5px auto 10px auto; padding: 0 4px; border: 1px solid #ed9; background-color: #fea; visibility: hidden;"> </div> |
| Index: branches/REL1_17/phase3/skins/common/commonPrint.css |
| — | — | @@ -18,12 +18,9 @@ |
| 19 | 19 | background-color: #f9f9f9; |
| 20 | 20 | padding: 5px; |
| 21 | 21 | } |
| 22 | | -body.ltr .tocindent { |
| | 22 | +.tocindent { |
| 23 | 23 | margin-left: 2em; |
| 24 | 24 | } |
| 25 | | -body.rtl .tocindent { |
| 26 | | - margin-right: 2em; |
| 27 | | -} |
| 28 | 25 | .tocline { |
| 29 | 26 | margin-bottom: 0px; |
| 30 | 27 | } |
| — | — | @@ -35,11 +32,6 @@ |
| 36 | 33 | position: relative; |
| 37 | 34 | margin: 0.5em 0 0.8em 1.4em; |
| 38 | 35 | } |
| 39 | | -body.rtl div.floatright { |
| 40 | | - float: left; |
| 41 | | - clear: left; |
| 42 | | - margin: 0.5em 1.4em 0.8em 0; |
| 43 | | -} |
| 44 | 36 | div.floatright p { |
| 45 | 37 | font-style: italic; |
| 46 | 38 | } |
| — | — | @@ -49,11 +41,6 @@ |
| 50 | 42 | position: relative; |
| 51 | 43 | margin: 0.5em 1.4em 0.8em 0; |
| 52 | 44 | } |
| 53 | | -body.rtl div.floatleft { |
| 54 | | - float: right; |
| 55 | | - clear: right; |
| 56 | | - margin: 0.5em 0 0.8em 1.4em; |
| 57 | | -} |
| 58 | 45 | div.floatleft p { |
| 59 | 46 | font-style: italic; |
| 60 | 47 | } |
| — | — | @@ -84,9 +71,6 @@ |
| 85 | 72 | padding: 3px !important; |
| 86 | 73 | font-size: 94%; |
| 87 | 74 | } |
| 88 | | -body.rtl .thumbcaption { |
| 89 | | - text-align: right; |
| 90 | | -} |
| 91 | 75 | |
| 92 | 76 | div.magnify { |
| 93 | 77 | display: none; |
| — | — | @@ -101,16 +85,6 @@ |
| 102 | 86 | clear: left; |
| 103 | 87 | margin: 0.5em 1.4em 0.8em 0; |
| 104 | 88 | } |
| 105 | | -body.rtl div.tright { |
| 106 | | - float: left; |
| 107 | | - clear: left; |
| 108 | | - border-width: 0.5em 1.4em 0.8em 0; |
| 109 | | -} |
| 110 | | -body.rtl div.tleft { |
| 111 | | - float: right; |
| 112 | | - clear: right; |
| 113 | | - border-width: 0.5em 0 0.8em 1.4em; |
| 114 | | -} |
| 115 | 89 | img.thumbborder { |
| 116 | 90 | border: 1px solid #dddddd; |
| 117 | 91 | } |
| Index: branches/REL1_17/phase3/includes/OutputPage.php |
| — | — | @@ -233,7 +233,7 @@ |
| 234 | 234 | * @return Array of module names |
| 235 | 235 | */ |
| 236 | 236 | public function getModules() { |
| 237 | | - return $this->mModules; |
| | 237 | + return array_values( array_unique( $this->mModules ) ); |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
| — | — | @@ -252,7 +252,7 @@ |
| 253 | 253 | * @return array of module names |
| 254 | 254 | */ |
| 255 | 255 | public function getModuleScripts() { |
| 256 | | - return $this->mModuleScripts; |
| | 256 | + return array_values( array_unique( $this->mModuleScripts ) ); |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | /** |
| — | — | @@ -272,7 +272,7 @@ |
| 273 | 273 | * @return Array of module names |
| 274 | 274 | */ |
| 275 | 275 | public function getModuleStyles() { |
| 276 | | - return $this->mModuleStyles; |
| | 276 | + return array_values( array_unique( $this->mModuleStyles ) ); |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | /** |
| — | — | @@ -292,7 +292,7 @@ |
| 293 | 293 | * @return Array of module names |
| 294 | 294 | */ |
| 295 | 295 | public function getModuleMessages() { |
| 296 | | - return $this->mModuleMessages; |
| | 296 | + return array_values( array_unique( $this->mModuleMessages ) ); |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | /** |
| — | — | @@ -2350,7 +2350,7 @@ |
| 2351 | 2351 | */ |
| 2352 | 2352 | protected function makeResourceLoaderLink( Skin $skin, $modules, $only, $useESI = false ) { |
| 2353 | 2353 | global $wgUser, $wgLang, $wgLoadScript, $wgResourceLoaderUseESI, |
| 2354 | | - $wgResourceLoaderInlinePrivateModules; |
| | 2354 | + $wgResourceLoaderInlinePrivateModules, $wgRequest; |
| 2355 | 2355 | // Lazy-load ResourceLoader |
| 2356 | 2356 | // TODO: Should this be a static function of ResourceLoader instead? |
| 2357 | 2357 | // TODO: Divide off modules starting with "user", and add the user parameter to them |
| — | — | @@ -2360,6 +2360,13 @@ |
| 2361 | 2361 | 'skin' => $skin->getSkinName(), |
| 2362 | 2362 | 'only' => $only, |
| 2363 | 2363 | ); |
| | 2364 | + // Propagate printable and handheld parameters if present |
| | 2365 | + if ( $wgRequest->getBool( 'printable' ) ) { |
| | 2366 | + $query['printable'] = 1; |
| | 2367 | + } |
| | 2368 | + if ( $wgRequest->getBool( 'handheld' ) ) { |
| | 2369 | + $query['handheld'] = 1; |
| | 2370 | + } |
| 2364 | 2371 | |
| 2365 | 2372 | if ( !count( $modules ) ) { |
| 2366 | 2373 | return ''; |
| — | — | @@ -2745,7 +2752,7 @@ |
| 2746 | 2753 | } |
| 2747 | 2754 | |
| 2748 | 2755 | if( isset( $options['media'] ) ) { |
| 2749 | | - $media = $this->transformCssMedia( $options['media'] ); |
| | 2756 | + $media = self::transformCssMedia( $options['media'] ); |
| 2750 | 2757 | if( is_null( $media ) ) { |
| 2751 | 2758 | return ''; |
| 2752 | 2759 | } |
| — | — | @@ -2777,7 +2784,7 @@ |
| 2778 | 2785 | * @param $media String: current value of the "media" attribute |
| 2779 | 2786 | * @return String: modified value of the "media" attribute |
| 2780 | 2787 | */ |
| 2781 | | - function transformCssMedia( $media ) { |
| | 2788 | + public static function transformCssMedia( $media ) { |
| 2782 | 2789 | global $wgRequest, $wgHandheldForIPhone; |
| 2783 | 2790 | |
| 2784 | 2791 | // Switch in on-screen display for media testing |
| Property changes on: branches/REL1_17/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2785 | 2792 | Merged /trunk/phase3/includes/OutputPage.php:r79839,80003,80005 |
| Index: branches/REL1_17/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -390,7 +390,11 @@ |
| 391 | 391 | // See also http://bugs.php.net/bug.php?id=51579 |
| 392 | 392 | // To work around this, we tear down all output buffering before |
| 393 | 393 | // sending the 304. |
| 394 | | - while ( ob_get_level() > 0 ) { |
| | 394 | + // On some setups, ob_get_level() doesn't seem to go down to zero |
| | 395 | + // no matter how often we call ob_get_clean(), so instead of doing |
| | 396 | + // the more intuitive while ( ob_get_level() > 0 ) ob_get_clean(); |
| | 397 | + // we have to be safe here and avoid an infinite loop. |
| | 398 | + for ( $i = 0; $i < ob_get_level(); $i++ ) { |
| 395 | 399 | ob_end_clean(); |
| 396 | 400 | } |
| 397 | 401 | |
| — | — | @@ -575,7 +579,18 @@ |
| 576 | 580 | public static function makeCombinedStyles( array $styles ) { |
| 577 | 581 | $out = ''; |
| 578 | 582 | foreach ( $styles as $media => $style ) { |
| 579 | | - $out .= "@media $media {\n" . str_replace( "\n", "\n\t", "\t" . $style ) . "\n}\n"; |
| | 583 | + // Transform the media type based on request params and config |
| | 584 | + // The way that this relies on $wgRequest to propagate request params is slightly evil |
| | 585 | + $media = OutputPage::transformCssMedia( $media ); |
| | 586 | + |
| | 587 | + if ( $media === null ) { |
| | 588 | + // Skip |
| | 589 | + } else if ( $media === '' || $media == 'all' ) { |
| | 590 | + // Don't output invalid or frivolous @media statements |
| | 591 | + $out .= "$style\n"; |
| | 592 | + } else { |
| | 593 | + $out .= "@media $media {\n" . str_replace( "\n", "\n\t", "\t" . $style ) . "\n}\n"; |
| | 594 | + } |
| 580 | 595 | } |
| 581 | 596 | return $out; |
| 582 | 597 | } |
| Property changes on: branches/REL1_17/phase3/includes/resourceloader/ResourceLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 583 | 598 | Merged /trunk/phase3/includes/resourceloader/ResourceLoader.php:r79839,79862 |
| Index: branches/REL1_17/phase3/includes/libs/JavaScriptDistiller.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | public static function stripWhiteSpace( $script, $stripVerticalSpace = false ) { |
| 23 | 23 | $script = self::stripHorizontalSpace( $script ); |
| 24 | 24 | // If requested, make some vertical whitespace collapsing as well |
| 25 | | - if ( $collapseVertical ) { |
| | 25 | + if ( $stripVerticalSpace ) { |
| 26 | 26 | $script = self::stripVerticalSpace( $script ); |
| 27 | 27 | } |
| 28 | 28 | // Done |
| Index: branches/REL1_17/phase3/resources/jquery.ui/themes/default/jquery.ui.autocomplete.css |
| — | — | @@ -1,7 +1,7 @@ |
| 2 | 2 | /* Autocomplete |
| 3 | 3 | ----------------------------------*/ |
| 4 | 4 | .ui-autocomplete { position: absolute; cursor: default; } |
| 5 | | -.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; } |
| | 5 | +.ui-autocomplete-loading { background: white /* @embed */ url('images/ui-anim_basic_16x16.gif') right center no-repeat; } |
| 6 | 6 | |
| 7 | 7 | /* workarounds */ |
| 8 | 8 | * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ |
| Index: branches/REL1_17/phase3/resources/jquery.ui/themes/default/jquery.ui.theme.css |
| — | — | @@ -13,26 +13,26 @@ |
| 14 | 14 | .ui-widget { font-family: sans-serif; font-size: 1em; } |
| 15 | 15 | .ui-widget .ui-widget { font-size: 1em; } |
| 16 | 16 | .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: sans-serif; font-size: 1em; } |
| 17 | | -.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } |
| | 17 | +.ui-widget-content { border: 1px solid #aaaaaa; /* @embed */ background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } |
| 18 | 18 | .ui-widget-content a { color: #222222; } |
| 19 | | -.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_flat_75_cccccc_40x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } |
| | 19 | +.ui-widget-header { border: 1px solid #aaaaaa; /* @embed */ background: #cccccc url(images/ui-bg_flat_75_cccccc_40x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } |
| 20 | 20 | .ui-widget-header a { color: #222222; } |
| 21 | 21 | |
| 22 | 22 | /* Interaction states |
| 23 | 23 | ----------------------------------*/ |
| 24 | | -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_flat_75_e6e6e6_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #555555; } |
| | 24 | +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; /* @embed */ background: #e6e6e6 url(images/ui-bg_flat_75_e6e6e6_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #555555; } |
| 25 | 25 | .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; } |
| 26 | | -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_flat_75_dadada_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } |
| | 26 | +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; /* @embed */ background: #dadada url(images/ui-bg_flat_75_dadada_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } |
| 27 | 27 | .ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; } |
| 28 | | -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } |
| | 28 | +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; /* @embed */ background: #ffffff url(images/ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } |
| 29 | 29 | .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; } |
| 30 | 30 | .ui-widget :active { outline: none; } |
| 31 | 31 | |
| 32 | 32 | /* Interaction Cues |
| 33 | 33 | ----------------------------------*/ |
| 34 | | -.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_flat_55_fbf9ee_40x100.png) 50% 50% repeat-x; color: #363636; } |
| | 34 | +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; /* @embed */ background: #fbf9ee url(images/ui-bg_flat_55_fbf9ee_40x100.png) 50% 50% repeat-x; color: #363636; } |
| 35 | 35 | .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } |
| 36 | | -.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_flat_95_fef1ec_40x100.png) 50% 50% repeat-x; color: #cd0a0a; } |
| | 36 | +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; /* @embed */ background: #fef1ec url(images/ui-bg_flat_95_fef1ec_40x100.png) 50% 50% repeat-x; color: #cd0a0a; } |
| 37 | 37 | .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } |
| 38 | 38 | .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } |
| 39 | 39 | .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } |
| — | — | @@ -43,14 +43,12 @@ |
| 44 | 44 | ----------------------------------*/ |
| 45 | 45 | |
| 46 | 46 | /* states and images */ |
| 47 | | -.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } |
| 48 | | -.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } |
| 49 | | -.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } |
| 50 | | -.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); } |
| 51 | | -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } |
| 52 | | -.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } |
| 53 | | -.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } |
| 54 | | -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } |
| | 47 | +.ui-icon { width: 16px; height: 16px; } |
| | 48 | +.ui-icon, .ui-widget-content .ui-icon, .ui-widget-header .ui-icon { /* @embed */ background-image: url(images/ui-icons_222222_256x240.png); } |
| | 49 | +.ui-state-default .ui-icon { /* @embed */ background-image: url(images/ui-icons_888888_256x240.png); } |
| | 50 | +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon, .ui-state-active .ui-icon { /* @embed */ background-image: url(images/ui-icons_454545_256x240.png); } |
| | 51 | +.ui-state-highlight .ui-icon { /* @embed */ background-image: url(images/ui-icons_2e83ff_256x240.png); } |
| | 52 | +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon { /* @embed */ background-image: url(images/ui-icons_cd0a0a_256x240.png); } |
| 55 | 53 | |
| 56 | 54 | /* positioning */ |
| 57 | 55 | .ui-icon-carat-1-n { background-position: 0 0; } |
| — | — | @@ -245,5 +243,6 @@ |
| 246 | 244 | .ui-corner-all { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; } |
| 247 | 245 | |
| 248 | 246 | /* Overlays */ |
| 249 | | -.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } |
| 250 | | -.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; } |
| \ No newline at end of file |
| | 247 | +.ui-widget-overlay, .ui-widget-shadow { /* @embed */ background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; } |
| | 248 | +.ui-widget-overlay { opacity: .30;filter:Alpha(Opacity=30); } |
| | 249 | +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; } |
| \ No newline at end of file |