| Index: branches/REL1_17/extensions/WikiEditor/modules/jquery.wikiEditor.templateEditor.js |
| — | — | @@ -319,6 +319,7 @@ |
| 320 | 320 | $(this).text( mediaWiki.msg( $(this).attr( 'rel' ) ) ); |
| 321 | 321 | } ); |
| 322 | 322 | }, |
| | 323 | + immediateCreate: true, |
| 323 | 324 | dialog: { |
| 324 | 325 | width: 600, |
| 325 | 326 | height: 400, |
| Index: branches/REL1_17/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | var mod = $.wikiEditor.modules.dialogs.modules[module]; |
| 44 | 44 | var $dialog = $( '#' + mod.id ); |
| 45 | 45 | if ( $dialog.length == 0 ) { |
| 46 | | - $.wikiEditor.modules.dialogs.fn.reallyCreate( context, mod ); |
| | 46 | + $.wikiEditor.modules.dialogs.fn.reallyCreate( context, mod, module ); |
| 47 | 47 | $dialog = $( '#' + mod.id ); |
| 48 | 48 | } |
| 49 | 49 | |
| — | — | @@ -72,7 +72,7 @@ |
| 73 | 73 | */ |
| 74 | 74 | create: function( context, config ) { |
| 75 | 75 | // Defer building of modules, but do check whether they need the iframe rightaway |
| 76 | | - for ( mod in config ) { |
| | 76 | + for ( var mod in config ) { |
| 77 | 77 | var module = config[mod]; |
| 78 | 78 | // Only create the dialog if it's supported, isn't filtered and doesn't exist yet |
| 79 | 79 | var filtered = false; |
| — | — | @@ -91,6 +91,10 @@ |
| 92 | 92 | context.fn.setupIframe(); |
| 93 | 93 | } |
| 94 | 94 | context.$textarea.trigger( 'wikiEditor-dialogs-setup-' + mod ); |
| | 95 | + // If this dialog requires immediate creation, create it now |
| | 96 | + if ( typeof module.immediateCreate !== 'undefined' && module.immediateCreate ) { |
| | 97 | + $.wikiEditor.modules.dialogs.fn.reallyCreate( context, module, mod ); |
| | 98 | + } |
| 95 | 99 | } |
| 96 | 100 | } |
| 97 | 101 | }, |
| — | — | @@ -98,8 +102,9 @@ |
| 99 | 103 | * Build the actual dialog. This done on-demand rather than in create() |
| 100 | 104 | * @param {Object} context Context object of editor dialog belongs to |
| 101 | 105 | * @param {Object} module Dialog module object |
| | 106 | + * @param {String} name Dialog name (key in $.wikiEditor.modules.dialogs.modules) |
| 102 | 107 | */ |
| 103 | | - reallyCreate: function( context, module ) { |
| | 108 | + reallyCreate: function( context, module, name ) { |
| 104 | 109 | var configuration = module.dialog; |
| 105 | 110 | // Add some stuff to configuration |
| 106 | 111 | configuration.bgiframe = true; |
| — | — | @@ -110,7 +115,7 @@ |
| 111 | 116 | // Stupid JS won't let us do stuff like |
| 112 | 117 | // foo = { mediaWiki.msg( 'bar' ): baz } |
| 113 | 118 | configuration.newButtons = {}; |
| 114 | | - for ( msg in configuration.buttons ) |
| | 119 | + for ( var msg in configuration.buttons ) |
| 115 | 120 | configuration.newButtons[mediaWiki.msg( msg )] = configuration.buttons[msg]; |
| 116 | 121 | configuration.buttons = configuration.newButtons; |
| 117 | 122 | // Create the dialog <div> |
| — | — | @@ -137,7 +142,7 @@ |
| 138 | 143 | } ); |
| 139 | 144 | |
| 140 | 145 | // Let the outside world know we set up this dialog |
| 141 | | - context.$textarea.trigger( 'wikiEditor-dialogs-loaded-' + mod ); |
| | 146 | + context.$textarea.trigger( 'wikiEditor-dialogs-loaded-' + name ); |
| 142 | 147 | }, |
| 143 | 148 | /** |
| 144 | 149 | * Resize a dialog so its contents fit |
| Index: branches/REL1_17/extensions/WikiEditor/modules/jquery.wikiEditor.html |
| — | — | @@ -59,7 +59,7 @@ |
| 60 | 60 | padding: 0.5em 4px; |
| 61 | 61 | padding-top: 1.25em; |
| 62 | 62 | margin-top: -0.95em; |
| 63 | | - background: #F3F3F3 url(../../images/wikiEditor/templateEditor/text-base.png) repeat-x scroll center top; |
| | 63 | + background: #F3F3F3 url(images/templateEditor/text-base.png) repeat-x scroll center top; |
| 64 | 64 | display: block; |
| 65 | 65 | width: 100%; |
| 66 | 66 | border-bottom: solid 1px #cccccc; |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | margin-bottom: -1px; |
| 78 | 78 | margin-right: 2px; |
| 79 | 79 | overflow: hidden; |
| 80 | | - background: url( '../../images/wikiEditor/templateEditor/name-base.png' ) 0 0 repeat-x #e8e8e8; |
| | 80 | + background: url(images/templateEditor/name-base.png) 0 0 repeat-x #e8e8e8; |
| 81 | 81 | color: #000000; |
| 82 | 82 | font-family: monospace; |
| 83 | 83 | text-decoration: none; |
| — | — | @@ -108,16 +108,16 @@ |
| 109 | 109 | text-decoration: underline; |
| 110 | 110 | } |
| 111 | 111 | .wikiEditor-templateEditor .wikiEditor-template-expanded .wikiEditor-template-expand { |
| 112 | | - background-image: url(../../images/wikiEditor/templateEditor/collapse.png); |
| | 112 | + background-image: url(images/templateEditor/collapse.png); |
| 113 | 113 | } |
| 114 | 114 | .wikiEditor-templateEditor .wikiEditor-template-expanded .wikiEditor-template-dialog { |
| 115 | | - background-image: url(../../images/wikiEditor/templateEditor/dialog-expanded.png); |
| | 115 | + background-image: url(images/templateEditor/dialog-expanded.png); |
| 116 | 116 | } |
| 117 | 117 | .wikiEditor-templateEditor .wikiEditor-template-collapsed .wikiEditor-template-expand { |
| 118 | | - background-image: url(../../images/wikiEditor/templateEditor/expand.png); |
| | 118 | + background-image: url(images/templateEditor/expand.png); |
| 119 | 119 | } |
| 120 | 120 | .wikiEditor-templateEditor .wikiEditor-template-collapsed .wikiEditor-template-dialog { |
| 121 | | - background-image: url(../../images/wikiEditor/templateEditor/dialog-collapsed.png); |
| | 121 | + background-image: url(images/templateEditor/dialog-collapsed.png); |
| 122 | 122 | } |
| 123 | 123 | .wikiEditor-templateEditor .wikiEditor-template-expanded { |
| 124 | 124 | display: block; |
| Index: branches/REL1_17/phase3/skins/common/prefs.js |
| — | — | @@ -14,8 +14,8 @@ |
| 15 | 15 | }; |
| 16 | 16 | |
| 17 | 17 | window.timezoneSetup = function() { |
| 18 | | - var tzSelect = document.getElementById( 'mw-input-timecorrection' ); |
| 19 | | - var tzTextbox = document.getElementById( 'mw-input-timecorrection-other' ); |
| | 18 | + var tzSelect = document.getElementById( 'mw-input-wptimecorrection' ); |
| | 19 | + var tzTextbox = document.getElementById( 'mw-input-wptimecorrection-other' ); |
| 20 | 20 | |
| 21 | 21 | if ( tzSelect && tzTextbox ) { |
| 22 | 22 | addHandler( tzSelect, 'change', function( e ) { updateTimezoneSelection( false ); } ); |
| — | — | @@ -40,8 +40,8 @@ |
| 41 | 41 | }; |
| 42 | 42 | |
| 43 | 43 | window.guessTimezone = function() { |
| 44 | | - var textbox = document.getElementById( 'mw-input-timecorrection-other' ); |
| 45 | | - var selector = document.getElementById( 'mw-input-timecorrection' ); |
| | 44 | + var textbox = document.getElementById( 'mw-input-wptimecorrection-other' ); |
| | 45 | + var selector = document.getElementById( 'mw-input-wptimecorrection' ); |
| 46 | 46 | |
| 47 | 47 | selector.value = 'other'; |
| 48 | 48 | textbox.value = fetchTimezone(); |
| — | — | @@ -50,13 +50,13 @@ |
| 51 | 51 | }; |
| 52 | 52 | |
| 53 | 53 | window.updateTimezoneSelection = function( force_offset ) { |
| 54 | | - var selector = document.getElementById( 'mw-input-timecorrection' ); |
| | 54 | + var selector = document.getElementById( 'mw-input-wptimecorrection' ); |
| 55 | 55 | |
| 56 | 56 | if ( selector.value == 'guess' ) { |
| 57 | 57 | return guessTimezone(); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | | - var textbox = document.getElementById( 'mw-input-timecorrection-other' ); |
| | 60 | + var textbox = document.getElementById( 'mw-input-wptimecorrection-other' ); |
| 61 | 61 | var localtimeHolder = document.getElementById( 'wpLocalTime' ); |
| 62 | 62 | var servertime = document.getElementsByName( 'wpServerTime' )[0].value; |
| 63 | 63 | var minDiff = 0; |
| Property changes on: branches/REL1_17/phase3/skins/common/prefs.js |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 64 | 64 | Merged /branches/new-installer/phase3/skins/common/prefs.js:r43664-66004 |
| 65 | 65 | Merged /branches/REL1_15/phase3/skins/common/prefs.js:r51646 |
| 66 | 66 | Merged /branches/sqlite/skins/common/prefs.js:r58211-58321 |
| 67 | 67 | Merged /trunk/phase3/skins/common/prefs.js:r79245,79581 |
| Index: branches/REL1_17/phase3/includes/resourceloader/ResourceLoaderUserModule.php |
| — | — | @@ -28,9 +28,7 @@ |
| 29 | 29 | /* Protected Methods */ |
| 30 | 30 | |
| 31 | 31 | protected function getPages( ResourceLoaderContext $context ) { |
| 32 | | - global $wgAllowUserCss; |
| 33 | | - |
| 34 | | - if ( $context->getUser() && $wgAllowUserCss ) { |
| | 32 | + if ( $context->getUser() ) { |
| 35 | 33 | $username = $context->getUser(); |
| 36 | 34 | return array( |
| 37 | 35 | "$username/common.js" => array( 'ns' => NS_USER, 'type' => 'script' ), |
| Index: branches/REL1_17/phase3/resources/jquery.ui/themes/vector/jquery.ui.dialog.css |
| — | — | @@ -23,11 +23,13 @@ |
| 24 | 24 | padding: 0.9em 1.4em 0.6em !important; |
| 25 | 25 | } |
| 26 | 26 | body .ui-dialog .ui-widget-header { |
| | 27 | + /* @embed */ |
| 27 | 28 | background: #f0f0f0 url(images/titlebar-fade.png) repeat-x scroll 50% 100% !important; |
| 28 | 29 | } |
| 29 | 30 | /* FIXME: Should just update the icon sprite if we're keeping this X */ |
| 30 | 31 | body .ui-dialog .ui-icon-closethick { |
| 31 | | - background: url(images/close-x.png) no-repeat 50% 50% !important; |
| | 32 | + /* @embed */ |
| | 33 | + background: url(images/close.png) no-repeat 50% 50% !important; |
| 32 | 34 | } |
| 33 | 35 | body .ui-dialog .ui-dialog-buttonpane { |
| 34 | 36 | margin-top: 0 !important; |
| Index: branches/REL1_17/phase3/resources/jquery.ui/themes/vector/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 { /* @embed */ background: white 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/vector/jquery.ui.theme.css |
| — | — | @@ -13,26 +13,26 @@ |
| 14 | 14 | .ui-widget { font-family: sans-serif; font-size: 0.8em; } |
| 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: none; background: #f2f5f7 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x; color: #362b36; } |
| | 17 | +.ui-widget-content { border: none; /* @embed */ background: #f2f5f7 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x; color: #362b36; } |
| 18 | 18 | .ui-widget-content a { color: #362b36; } |
| 19 | | -.ui-widget-header { border: 1px solid #aed0ea; line-height: 1em; background: #ffffff url(images/ui-bg_highlight-soft_100_ffffff_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } |
| | 19 | +.ui-widget-header { border: 1px solid #aed0ea; line-height: 1em; /* @embed */ background: #ffffff url(images/ui-bg_highlight-soft_100_ffffff_1x100.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 #aed0ea; background: #d7ebf9 url(images/ui-bg_highlight-hard_80_d7ebf9_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #2779aa; } |
| | 24 | +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #aed0ea; /* @embed */ background: #d7ebf9 url(images/ui-bg_highlight-hard_80_d7ebf9_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #2779aa; } |
| 25 | 25 | .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2779aa; 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 #74b2e2; background: #e4f1fb url(images/ui-bg_highlight-soft_100_e4f1fb_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #0070a3; } |
| | 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 #74b2e2; /* @embed */ background: #e4f1fb url(images/ui-bg_highlight-soft_100_e4f1fb_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #0070a3; } |
| 27 | 27 | .ui-state-hover a, .ui-state-hover a:hover { color: #0070a3; text-decoration: none; } |
| 28 | | -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #cccccc; background: #f0f0f0 url(images/ui-bg_inset-hard_100_f0f0f0_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #000000; } |
| | 28 | +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #cccccc; background: #f0f0f0 /* @embed */ url(images/ui-bg_inset-hard_100_f0f0f0_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #000000; } |
| 29 | 29 | .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #000000; 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 #f9dd34; background: #ffef8f url(images/ui-bg_highlight-soft_25_ffef8f_1x100.png) 50% top repeat-x; color: #363636; } |
| | 34 | +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #f9dd34; background: #ffef8f /* @embed */ url(images/ui-bg_highlight-soft_25_ffef8f_1x100.png) 50% top 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: #cd0a0a url(images/ui-bg_flat_15_cd0a0a_40x100.png) 50% 50% repeat-x; color: #ffffff; } |
| | 36 | +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #cd0a0a /* @embed */ url(images/ui-bg_flat_15_cd0a0a_40x100.png) 50% 50% repeat-x; color: #ffffff; } |
| 37 | 37 | .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; } |
| 38 | 38 | .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; } |
| 39 | 39 | .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } |
| — | — | @@ -43,14 +43,13 @@ |
| 44 | 44 | ----------------------------------*/ |
| 45 | 45 | |
| 46 | 46 | /* states and images */ |
| 47 | | -.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_72a7cf_256x240.png); } |
| 48 | | -.ui-widget-content .ui-icon {background-image: url(images/ui-icons_72a7cf_256x240.png); } |
| 49 | | -.ui-widget-header .ui-icon {background-image: url(images/ui-icons_72a7cf_256x240.png); } |
| 50 | | -.ui-state-default .ui-icon { background-image: url(images/ui-icons_3d80b3_256x240.png); } |
| 51 | | -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_2694e8_256x240.png); } |
| 52 | | -.ui-state-active .ui-icon {background-image: url(images/ui-icons_666666_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_ffffff_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_72a7cf_256x240.png); } |
| | 49 | +.ui-state-default .ui-icon { /* @embed */ background-image: url(images/ui-icons_3d80b3_256x240.png); } |
| | 50 | +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon { /* @embed */ background-image: url(images/ui-icons_2694e8_256x240.png); } |
| | 51 | +.ui-state-active .ui-icon { /* @embed */ background-image: url(images/ui-icons_666666_256x240.png); } |
| | 52 | +.ui-state-highlight .ui-icon { /* @embed */ background-image: url(images/ui-icons_2e83ff_256x240.png); } |
| | 53 | +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon { /* @embed */ background-image: url(images/ui-icons_ffffff_256x240.png); } |
| 55 | 54 | |
| 56 | 55 | /* positioning */ |
| 57 | 56 | .ui-icon-carat-1-n { background-position: 0 0; } |
| — | — | @@ -246,4 +245,4 @@ |
| 247 | 246 | |
| 248 | 247 | /* Overlays */ |
| 249 | 248 | .ui-widget-overlay { background: #000000; opacity: .75;filter:Alpha(Opacity=75); } |
| 250 | | -.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #000000 url(images/ui-bg_flat_70_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; } |
| \ No newline at end of file |
| | 249 | +.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; /* @embed */ background: #000000 url(images/ui-bg_flat_70_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; } |
| \ No newline at end of file |
| Index: branches/REL1_17/phase3/resources/jquery.ui/themes/vector/jquery.ui.button.css |
| — | — | @@ -35,6 +35,7 @@ |
| 36 | 36 | padding: 0.2em 0.6em 0.15em !important; |
| 37 | 37 | margin: 0.5em 0 0.5em 0.4em !important; |
| 38 | 38 | border: 1px solid #a6a6a6 !important; |
| | 39 | + /* @embed */ |
| 39 | 40 | background: #f2f2f2 url(images/button-off.png) repeat-x scroll 50% 100% !important; |
| 40 | 41 | cursor: pointer; |
| 41 | 42 | font-size: 1em; |
| — | — | @@ -44,16 +45,19 @@ |
| 45 | 46 | } |
| 46 | 47 | body button.ui-button:hover { |
| 47 | 48 | border-color: #6e7273; |
| | 49 | + /* @embed */ |
| 48 | 50 | background: #e1e1e1 url(images/button-over.png) repeat-x scroll 50% 100% !important; |
| 49 | 51 | } |
| 50 | 52 | body button.ui-button:active, |
| 51 | 53 | body button.ui-button:focus { |
| 52 | 54 | border-color: #707271; |
| | 55 | + /* @embed */ |
| 53 | 56 | background: #bfbfbf url(images/button-down.png) repeat-x scroll 50% 100% !important; |
| 54 | 57 | } |
| 55 | 58 | body button.ui-button.disabled { |
| 56 | 59 | color: #7f7f7f; |
| 57 | 60 | border-color: #cccccc; |
| | 61 | + /* @embed */ |
| 58 | 62 | background: #f2f2f2 url(images/button-disabled.png) repeat-x scroll 50% 100% !important; |
| 59 | 63 | } |
| 60 | 64 | /* Disables the annoying dashed border Firefox puts on active buttons */ |