r69344 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r69343‎ | r69344 | r69345 >
Date:20:42, 14 July 2010
Author:neilk
Status:deferred
Tags:
Comment:
removed jellomold IE workaround; we can probably safely ignore min-width and max-width issues with IE 5.5 and 6
Modified paths:
  • /trunk/extensions/UploadWizard/js/mw.UploadWizard.js (modified) (history)
  • /trunk/extensions/UploadWizard/styles/uploadWizard.css (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/styles/uploadWizard.css
@@ -14,6 +14,8 @@
1515
1616 #upload-wizard {
1717 margin-top: 18px;
 18+ min-width: 32em;
 19+ max-width: 64em;
1820 }
1921
2022 /*
Index: trunk/extensions/UploadWizard/js/mw.UploadWizard.js
@@ -2017,28 +2017,9 @@
20182018 createInterface: function( selector ) {
20192019 var _this = this;
20202020 var div = $j( selector ).get(0);
2021 - // XXX move this to PHP
20222021 div.innerHTML =
2023 - // begin css jello mold -- this allows layout to flex in size between a minimum and maximum
2024 - // http://www.positioniseverything.net/articles/jello-expo.html
2025 - // XXX including a style like this inline is a bit evil, but I wanted the rules + the IE-specific conditionals
2026 - // to all be in one place. Perhaps better done with JS, then could be parameterized too.
2027 - '<style>'
2028 - + '#mwe-upwiz-jellobody { padding: 0 16em 0 16em; margin: 0; text-align: left; }'
2029 - + '#mwe-upwiz-jellosizer { margin: 0; padding: 0; width: 100%; max-width: 29em; }'
2030 - + '#mwe-upwiz-jelloexpander { margin: 0 -16em 0 -16em; min-width: 32em; position: relative; }'
2031 - + '#mwe-upwiz-jellofixer { width: 100%; margin: 0; padding: 0; }'
2032 - + '</style>'
2033 - + '<!--[if IE]>'
2034 - + '<style type="text/css">'
2035 - + '.mwe-upwiz-jellosizer { width:expression(document.body.clientWidth > 1004 ? "29em" : "100%" ); }'
2036 - + '</style>'
2037 - + '<![endif]-->'
2038 - + '<div id="mwe-upwiz-jellobody"><div id="mwe-upwiz-jellosizer"><div id="mwe-upwiz-jelloexpander"><div id="mwe-upwiz-jellofixer">'
2039 - // end of CSS jello mold preamble
2040 -
20412022 // the arrow steps
2042 - + '<ul id="mwe-upwiz-steps">'
 2023+ '<ul id="mwe-upwiz-steps">'
20432024 + '<li id="mwe-upwiz-step-file"><div>' + gM('mwe-upwiz-step-file') + '</div></li>'
20442025 + '<li id="mwe-upwiz-step-deeds"><div>' + gM('mwe-upwiz-step-deeds') + '</div></li>'
20452026 + '<li id="mwe-upwiz-step-details"><div>' + gM('mwe-upwiz-step-details') + '</div></li>'
@@ -2097,9 +2078,6 @@
20982079 + '</div>'
20992080
21002081 + '<div class="mwe-upwiz-clearing"></div>';
2101 -
2102 - // end jellomold
2103 - + '</div></div></div></div>';
21042082
21052083 $j( '#mwe-upwiz-steps' )
21062084 .addClass( 'ui-helper-clearfix ui-state-default ui-widget ui-helper-reset ui-helper-clearfix' )

Status & tagging log