Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
fnagel committed Nov 10, 2012
2 parents 94b3a65 + d6c6b7d commit 7ce8e0515ea7cc513c3c065946c85cf2d1aa5652
Showing with 11,700 additions and 13,411 deletions.
  1. +5 −0 .editorconfig
  2. +3 −3 .jshintrc
  3. +0 −13 build/.jshintrc
  4. +32 −0 build/release/changelog-shell
  5. +4 −33 build/release/release.js
  6. +5 −2 build/tasks/build.js
  7. +12 −14 build/tasks/testswarm.js
  8. +0 −1 demos/autocomplete/combobox.html
  9. +0 −1 demos/autocomplete/custom-data.html
  10. +1 −1 demos/button/icons.html
  11. +2 −0 demos/datepicker/localization.html
  12. +8 −6 demos/dialog/animated.html
  13. +0 −1 demos/dialog/default.html
  14. +0 −1 demos/dialog/modal-confirmation.html
  15. +0 −1 demos/dialog/modal-form.html
  16. +0 −1 demos/dialog/modal-message.html
  17. +0 −1 demos/dialog/modal.html
  18. +2 −2 demos/droppable/photo-manager.html
  19. +1 −1 demos/droppable/shopping-cart.html
  20. +41 −16 demos/menu/default.html
  21. +44 −0 demos/menu/icons.html
  22. +1 −2 demos/menu/index.html
  23. +0 −74 demos/menu/navigationmenu.html
  24. +0 −87 demos/menu/topalignmenu.html
  25. +4 −2 demos/position/cycler.html
  26. +0 −5 demos/position/default.html
  27. +1 −1 demos/slider/hotelrooms.html
  28. +0 −1 demos/slider/side-scroll.html
  29. +3 −0 demos/tooltip/custom-content.html
  30. +1 −1 demos/tooltip/forms.html
  31. +0 −39 external/jquery.bgiframe-2.1.2.js
  32. +0 −89 external/jquery.cookie.js
  33. +0 −122 external/jquery.metadata.js
  34. +1,615 −1,170 external/jshint.js
  35. +8 −10 grunt.js
  36. +1,664 −1,664 jquery-1.8.2.js
  37. +2 −7 package.json
  38. +2 −27 tests/.jshintrc
  39. +53 −53 tests/jquery-1.6.1.js
  40. +55 −55 tests/jquery-1.6.2.js
  41. +54 −54 tests/jquery-1.6.3.js
  42. +54 −54 tests/jquery-1.6.4.js
  43. +65 −65 tests/jquery-1.6.js
  44. +41 −41 tests/jquery-1.7.1.js
  45. +1 −1 tests/jquery-1.7.2.js
  46. +41 −41 tests/jquery-1.7.js
  47. +1,461 −1,461 tests/jquery-1.8.0.js
  48. +1,529 −1,529 tests/jquery-1.8.1.js
  49. +1,664 −1,664 tests/jquery-1.8.2.js
  50. +2 −2 tests/jquery.simulate.js
  51. +0 −3 tests/unit/accordion/accordion.html
  52. +0 −29 tests/unit/accordion/accordion_common_deprecated.js
  53. +0 −140 tests/unit/accordion/accordion_deprecated.html
  54. +0 −342 tests/unit/accordion/accordion_deprecated.js
  55. +28 −21 tests/unit/accordion/accordion_options.js
  56. +0 −72 tests/unit/all-active.html
  57. +5 −8 tests/unit/all.html
  58. +3 −4 tests/unit/autocomplete/autocomplete_core.js
  59. +3 −3 tests/unit/autocomplete/autocomplete_events.js
  60. +1 −1 tests/unit/autocomplete/autocomplete_options.js
  61. +1 −1 tests/unit/button/button_events.js
  62. +8 −0 tests/unit/button/button_tickets.js
  63. +5 −0 tests/unit/core/core.html
  64. +12 −0 tests/unit/core/selector.js
  65. +1 −11 tests/unit/datepicker/datepicker.html
  66. +60 −99 tests/unit/datepicker/datepicker_core.js
  67. +3 −1 tests/unit/datepicker/datepicker_defaults.js
  68. +24 −5 tests/unit/datepicker/datepicker_events.js
  69. +19 −19 tests/unit/datepicker/datepicker_methods.js
  70. +182 −128 tests/unit/datepicker/datepicker_options.js
  71. +22 −0 tests/unit/datepicker/datepicker_test_helpers.js
  72. +0 −88 tests/unit/datepicker/datepicker_tickets.js
  73. +3 −12 tests/unit/dialog/dialog.html
  74. +0 −2 tests/unit/dialog/dialog_common.js
  75. +10 −89 tests/unit/dialog/dialog_core.js
  76. +140 −113 tests/unit/dialog/dialog_events.js
  77. +41 −31 tests/unit/dialog/dialog_methods.js
  78. +146 −138 tests/unit/dialog/dialog_options.js
  79. +45 −0 tests/unit/dialog/dialog_test_helpers.js
  80. +20 −94 tests/unit/dialog/dialog_tickets.js
  81. +4 −10 tests/unit/draggable/draggable.html
  82. +1 −0 tests/unit/draggable/draggable_common.js
  83. +19 −39 tests/unit/draggable/draggable_core.js
  84. +30 −24 tests/unit/draggable/draggable_events.js
  85. +24 −29 tests/unit/draggable/draggable_methods.js
  86. +359 −315 tests/unit/draggable/draggable_options.js
  87. +57 −0 tests/unit/draggable/draggable_test_helpers.js
  88. +1 −10 tests/unit/droppable/droppable.html
  89. +1 −0 tests/unit/droppable/droppable_common.js
  90. +7 −14 tests/unit/droppable/droppable_core.js
  91. +7 −0 tests/unit/droppable/droppable_events.js
  92. +21 −19 tests/unit/droppable/droppable_methods.js
  93. +8 −5 tests/unit/droppable/droppable_options.js
  94. +10 −0 tests/unit/droppable/droppable_test_helpers.js
  95. +0 −3 tests/unit/effects/effects.html
  96. +16 −9 tests/unit/effects/effects_core.js
  97. +15 −15 tests/unit/menu/menu_events.js
  98. +10 −1 tests/unit/menu/menu_methods.js
  99. +2 −2 tests/unit/menu/menu_options.js
  100. +0 −3 tests/unit/position/position.html
  101. +3 −0 tests/unit/position/position_core.js
  102. +0 −56 tests/unit/position/position_deprecated.html
  103. +0 −33 tests/unit/position/position_deprecated.js
  104. +18 −0 tests/unit/progressbar/progressbar_options.js
  105. +1 −10 tests/unit/resizable/resizable.html
  106. +36 −32 tests/unit/resizable/resizable_core.js
  107. +4 −0 tests/unit/resizable/resizable_events.js
  108. +3 −0 tests/unit/resizable/resizable_methods.js
  109. +40 −26 tests/unit/resizable/resizable_options.js
  110. +15 −0 tests/unit/resizable/resizable_test_helpers.js
  111. +1 −10 tests/unit/selectable/selectable.html
  112. +1 −0 tests/unit/selectable/selectable_common.js
  113. +1 −14 tests/unit/selectable/selectable_core.js
  114. +4 −4 tests/unit/selectable/selectable_events.js
  115. +9 −13 tests/unit/selectable/selectable_methods.js
  116. +15 −10 tests/unit/selectable/selectable_options.js
  117. +8 −0 tests/unit/selectable/selectable_test_helpers.js
  118. +0 −10 tests/unit/slider/slider.html
  119. +12 −12 tests/unit/slider/slider_events.js
  120. +2 −2 tests/unit/slider/slider_methods.js
  121. +17 −10 tests/unit/sortable/sortable.html
  122. +1 −0 tests/unit/sortable/sortable_common.js
  123. +1 −7 tests/unit/sortable/sortable_core.js
  124. +19 −9 tests/unit/sortable/sortable_events.js
  125. +18 −34 tests/unit/sortable/sortable_methods.js
  126. +6 −1 tests/unit/sortable/sortable_options.js
  127. +9 −0 tests/unit/sortable/sortable_test_helpers.js
  128. +16 −30 tests/unit/sortable/sortable_tickets.js
  129. +2 −4 tests/unit/spinner/spinner_options.js
  130. +1 −3 tests/unit/subsuite.js
  131. +3 −2 tests/unit/swarminject.js
  132. +0 −3 tests/unit/tabs/tabs.html
  133. +0 −32 tests/unit/tabs/tabs_common_deprecated.js
  134. +5 −6 tests/unit/tabs/tabs_core.js
  135. +0 −157 tests/unit/tabs/tabs_deprecated.html
  136. +0 −599 tests/unit/tabs/tabs_deprecated.js
  137. +47 −49 tests/unit/tabs/tabs_events.js
  138. +2 −10 tests/unit/tabs/tabs_methods.js
  139. +22 −24 tests/unit/tabs/tabs_options.js
  140. +44 −4 tests/unit/testsuite.js
  141. +5 −0 tests/unit/tooltip/tooltip.html
  142. +4 −4 tests/unit/tooltip/tooltip_common.js
  143. +63 −0 tests/unit/tooltip/tooltip_core.js
  144. +6 −32 tests/unit/tooltip/tooltip_events.js
  145. +52 −1 tests/unit/tooltip/tooltip_options.js
  146. +161 −18 tests/unit/widget/widget_core.js
  147. +9 −6 tests/unit/widget/widget_extend.js
  148. +52 −0 tests/visual/dialog/animated.html
  149. +94 −0 tests/visual/dialog/complex-dialogs.html
  150. +69 −0 tests/visual/dialog/form.html
  151. +0 −1 tests/visual/dialog/performance.html
  152. +14 −15 tests/visual/position/position_feedback.html
  153. +20 −6 tests/visual/tooltip/tooltip.html
  154. +2 −4 themes/base/jquery.ui.autocomplete.css
  155. +4 −2 themes/base/jquery.ui.core.css
  156. +0 −11 themes/base/jquery.ui.datepicker.css
  157. +1 −1 themes/base/jquery.ui.dialog.css
  158. +1 −2 themes/base/jquery.ui.spinner.css
  159. +3 −2 themes/base/jquery.ui.theme.css
  160. +5 −10 themes/base/jquery.ui.tooltip.css
  161. +1 −1 ui/.jshintrc
  162. +1 −1 ui/i18n/jquery.ui.datepicker-ar.js
  163. +1 −1 ui/i18n/jquery.ui.datepicker-az.js
  164. +5 −5 ui/i18n/jquery.ui.datepicker-bs.js
  165. +1 −1 ui/i18n/jquery.ui.datepicker-cy-GB.js
  166. +1 −1 ui/i18n/jquery.ui.datepicker-el.js
  167. +1 −1 ui/i18n/jquery.ui.datepicker-es.js
  168. +1 −1 ui/i18n/jquery.ui.datepicker-et.js
  169. +1 −1 ui/i18n/jquery.ui.datepicker-eu.js
  170. +3 −3 ui/i18n/jquery.ui.datepicker-fa.js
  171. +1 −1 ui/i18n/jquery.ui.datepicker-fr-CH.js
  172. +1 −1 ui/i18n/jquery.ui.datepicker-gl.js
  173. +1 −1 ui/i18n/jquery.ui.datepicker-hr.js
  174. +1 −1 ui/i18n/jquery.ui.datepicker-hy.js
  175. +1 −1 ui/i18n/jquery.ui.datepicker-id.js
  176. +1 −1 ui/i18n/jquery.ui.datepicker-is.js
  177. +1 −1 ui/i18n/jquery.ui.datepicker-ja.js
  178. +1 −1 ui/i18n/jquery.ui.datepicker-ko.js
  179. +24 −0 ui/i18n/jquery.ui.datepicker-ky.js
  180. +1 −1 ui/i18n/jquery.ui.datepicker-lt.js
  181. +1 −1 ui/i18n/jquery.ui.datepicker-lv.js
  182. +1 −1 ui/i18n/jquery.ui.datepicker-ml.js
  183. +1 −1 ui/i18n/jquery.ui.datepicker-ms.js
  184. +1 −1 ui/i18n/jquery.ui.datepicker-nl.js
  185. +1 −1 ui/i18n/jquery.ui.datepicker-pt-BR.js
  186. +1 −1 ui/i18n/jquery.ui.datepicker-pt.js
  187. +1 −1 ui/i18n/jquery.ui.datepicker-ru.js
  188. +1 −1 ui/i18n/jquery.ui.datepicker-th.js
  189. +1 −1 ui/i18n/jquery.ui.datepicker-tj.js
  190. +1 −1 ui/i18n/jquery.ui.datepicker-tr.js
  191. +1 −1 ui/i18n/jquery.ui.datepicker-uk.js
  192. +3 −210 ui/jquery.ui.accordion.js
  193. +7 −14 ui/jquery.ui.autocomplete.js
  194. +2 −2 ui/jquery.ui.button.js
  195. +64 −78 ui/jquery.ui.core.js
  196. +137 −137 ui/jquery.ui.datepicker.js
  197. +94 −255 ui/jquery.ui.dialog.js
  198. +51 −60 ui/jquery.ui.draggable.js
  199. +28 −26 ui/jquery.ui.droppable.js
  200. +1 −1 ui/jquery.ui.effect-highlight.js
  201. +20 −10 ui/jquery.ui.effect-scale.js
  202. +25 −53 ui/jquery.ui.effect.js
  203. +24 −23 ui/jquery.ui.menu.js
  204. +8 −8 ui/jquery.ui.mouse.js
  205. +0 −40 ui/jquery.ui.position.js
  206. +58 −25 ui/jquery.ui.progressbar.js
  207. +96 −86 ui/jquery.ui.resizable.js
  208. +31 −23 ui/jquery.ui.selectable.js
  209. +11 −4 ui/jquery.ui.slider.js
  210. +35 −28 ui/jquery.ui.sortable.js
  211. +1 −4 ui/jquery.ui.spinner.js
  212. +11 −529 ui/jquery.ui.tabs.js
  213. +87 −31 ui/jquery.ui.tooltip.js
  214. +40 −26 ui/jquery.ui.widget.js
View
@@ -9,3 +9,8 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
+
+[external/**]
+trim_trailing_whitespace = false
+insert_final_newline = varies
+end_of_line = varies
View
@@ -3,10 +3,10 @@
"eqnull": true,
"eqeqeq": true,
"expr": true,
- "latedef": true,
"noarg": true,
+ "node": true,
"onevar": true,
- "smarttabs": true,
"trailing": true,
- "undef": true
+ "undef": true,
+ "unused": true
}
View
@@ -1,13 +0,0 @@
-{
- "curly": true,
- "eqnull": true,
- "eqeqeq": true,
- "expr": true,
- "noarg": true,
- "node": true,
- "onevar": true,
- "smarttabs": true,
- "strict": false,
- "trailing": true,
- "undef": true
-}
@@ -24,54 +24,86 @@ DELETE EVERYTHING ABOVE THE FOLLOWING LINE
## Build
+
## Core & Utilities
### UI Core
+
### Mouse
+
### Widget Factory
+
### Position
+
## Interactions
### Draggable
+
### Droppable
+
### Resizable
+
### Selectable
+
### Sortable
+
## Widgets
### Accordion
+
### Autocomplete
+
### Button
+
### Datepicker
+
### Dialog
+
+### Menu
+
+
### Progressbar
+
### Slider
+
+### Spinner
+
+
### Tabs
+
+### Tooltip
+
+
## Effects
+
### Individual effects
+
## CSS Framework
+
## Demos
+
## Website
+
### Download Builder
View
@@ -1,5 +1,7 @@
#!/usr/bin/env node
-/*global cat:true cd:true cp:true echo:true exec:true exit:true ls:true*/
+/*global cat:true cd:true echo:true exec:true exit:true*/
+
+"use strict";
var baseDir, repoDir, prevVersion, newVersion, nextVersion, tagTime,
fs = require( "fs" ),
@@ -41,9 +43,6 @@ walk([
section( "gathering contributors" ),
gatherContributors,
- section( "generating quick download" ),
- generateQuickDownload,
-
section( "updating trac" ),
updateTrac,
confirm
@@ -261,34 +260,6 @@ function gatherContributors() {
echo( "Stored contributors in " + contributorsPath.cyan + "." );
}
-function generateQuickDownload() {
- var config,
- downloadDir = repoDir + "/node_modules/download.jqueryui.com",
- filename = "jquery-ui-" + newVersion + ".custom.zip",
- destination = baseDir + "/" + filename;
-
- cd( downloadDir );
-
- // Update jQuery UI version for download builder
- config = JSON.parse( cat( "config.json" ) );
- config.jqueryUi = newVersion;
- JSON.stringify( config ).to( "config.json" );
-
- // Generate quick download
- // TODO: Find a way to avoid having to clone jquery-ui inside download builder
- if ( exec( "grunt prepare build" ).code !== 0 ) {
- abort( "Error generating quick download." );
- }
- cp( downloadDir + "/release/" + filename, destination );
- // cp() doesn't have error handling, so check for the file
- if ( ls( destination ).length !== 1 ) {
- abort( "Error copying quick download." );
- }
-
- // Go back to repo directory for consistency
- cd( repoDir );
-}
-
function updateTrac() {
echo( newVersion.cyan + " was tagged at " + tagTime.cyan + "." );
echo( "Close the " + newVersion.cyan + " Milestone with the above date and time." );
@@ -423,7 +394,7 @@ function abort( msg ) {
function walk( methods ) {
var method = methods.shift();
- function next( error ) {
+ function next() {
if ( methods.length ) {
walk( methods );
}
View
@@ -1,6 +1,9 @@
module.exports = function( grunt ) {
-var path = require( "path" );
+"use strict";
+
+var path = require( "path" ),
+ fs = require( "fs" );
grunt.registerTask( "manifest", "Generate jquery.json manifest files", function() {
var pkg = grunt.config( "pkg" ),
@@ -143,7 +146,7 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() {
opts: {
cwd: 'dist'
}
- }, function( err, result ) {
+ }, function( err ) {
if ( err ) {
grunt.log.error( err );
done();
View
@@ -1,6 +1,7 @@
-/*jshint node: true */
module.exports = function( grunt ) {
+"use strict";
+
var versions = {
"git": "git",
"1.8": "1.8.0 1.8.1 1.8.2",
@@ -9,26 +10,23 @@ var versions = {
},
tests = {
"Accordion": "accordion/accordion.html",
- "Accordion_deprecated": "accordion/accordion_deprecated.html",
"Autocomplete": "autocomplete/autocomplete.html",
"Button": "button/button.html",
"Core": "core/core.html",
- //"datepicker/datepicker.html",
- //"dialog/dialog.html",
- //"draggable/draggable.html",
- //"droppable/droppable.html",
+ "Datepicker": "datepicker/datepicker.html",
+ "Dialog": "dialog/dialog.html",
+ "Draggable": "draggable/draggable.html",
+ "Droppable": "droppable/droppable.html",
"Effects": "effects/effects.html",
"Menu": "menu/menu.html",
"Position": "position/position.html",
- "Position_deprecated": "position/position_deprecated.html",
"Progressbar": "progressbar/progressbar.html",
- //"resizable/resizable.html",
- //"selectable/selectable.html",
- //"slider/slider.html",
- //"sortable/sortable.html",
+ "Resizable": "resizable/resizable.html",
+ "Selectable": "selectable/selectable.html",
+ "Slider": "slider/slider.html",
+ "Sortable": "sortable/sortable.html",
"Spinner": "spinner/spinner.html",
"Tabs": "tabs/tabs.html",
- "Tabs_deprecated": "tabs/tabs_deprecated.html",
"Tooltip": "tooltip/tooltip.html",
"Widget": "widget/widget.html"
};
@@ -53,9 +51,9 @@ function submit( commit, tests, configFile, version, done ) {
authToken: config.authToken,
jobName: 'jQuery UI ' + version + '#<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
runMax: config.runMax,
- "runNames[]": Object.keys(tests),
+ "runNames[]": Object.keys( tests ),
"runUrls[]": testUrls,
- "browserSets[]": ["popular"]
+ "browserSets[]": [ "popular-no-ie6" ]
});
}
@@ -111,7 +111,6 @@
input.data( "autocomplete" )._renderItem = function( ul, item ) {
return $( "<li>" )
- .data( "item.autocomplete", item )
.append( "<a>" + item.label + "</a>" )
.appendTo( ul );
};
@@ -68,7 +68,6 @@
})
.data( "autocomplete" )._renderItem = function( ul, item ) {
return $( "<li>" )
- .data( "item.autocomplete", item )
.append( "<a>" + item.label + "<br>" + item.desc + "</a>" )
.appendTo( ul );
};
View
@@ -43,7 +43,7 @@
<button>Button with two icons and no text</button>
<div class="demo-description">
-<p>Some buttons with various combinations of text and icons, here specified via metadata.</p>
+<p>Some buttons with various combinations of text and icons.</p>
</div>
</body>
</html>
@@ -46,6 +46,7 @@
<script src="../../ui/i18n/jquery.ui.datepicker-kk.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-km.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-ko.js"></script>
+ <script src="../../ui/i18n/jquery.ui.datepicker-ky.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-lb.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-lt.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-lv.js"></script>
@@ -134,6 +135,7 @@
<option value="kk">Kazakhstan (Kazakh)</option>
<option value="km">Khmer</option>
<option value="ko">Korean (&#54620;&#44397;&#50612;)</option>
+ <option value="ky">Kyrgyzstan (Kyrgyz)</option>
<option value="lv">Latvian (Latvie&ouml;u Valoda)</option>
<option value="lt">Lithuanian (lietuviu kalba)</option>
<option value="lb">Luxembourgish</option>
View
@@ -5,7 +5,6 @@
<title>jQuery UI Dialog - Animation</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.8.2.js"></script>
- <script src="../../external/jquery.bgiframe-2.1.2.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.mouse.js"></script>
@@ -18,18 +17,21 @@
<script src="../../ui/jquery.ui.effect-explode.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
- // increase the default animation speed to exaggerate the effect
- $.fx.speeds._default = 1000;
$(function() {
$( "#dialog" ).dialog({
autoOpen: false,
- show: "blind",
- hide: "explode"
+ show: {
+ effect: "blind",
+ duration: 1000
+ },
+ hide: {
+ effect: "explode",
+ duration: 1000
+ }
});
$( "#opener" ).click(function() {
$( "#dialog" ).dialog( "open" );
- return false;
});
});
</script>
@@ -5,7 +5,6 @@
<title>jQuery UI Dialog - Default functionality</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.8.2.js"></script>
- <script src="../../external/jquery.bgiframe-2.1.2.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.mouse.js"></script>
@@ -5,7 +5,6 @@
<title>jQuery UI Dialog - Modal confirmation</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.8.2.js"></script>
- <script src="../../external/jquery.bgiframe-2.1.2.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.mouse.js"></script>
@@ -5,7 +5,6 @@
<title>jQuery UI Dialog - Modal form</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.8.2.js"></script>
- <script src="../../external/jquery.bgiframe-2.1.2.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.mouse.js"></script>
@@ -5,7 +5,6 @@
<title>jQuery UI Dialog - Modal message</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.8.2.js"></script>
- <script src="../../external/jquery.bgiframe-2.1.2.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.mouse.js"></script>
View
@@ -5,7 +5,6 @@
<title>jQuery UI Dialog - Basic modal</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.8.2.js"></script>
- <script src="../../external/jquery.bgiframe-2.1.2.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.mouse.js"></script>
@@ -15,15 +15,15 @@
<script src="../../ui/jquery.ui.dialog.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
- #gallery { float: left; width: 65%; min-height: 12em; } * html #gallery { height: 12em; } /* IE6 */
+ #gallery { float: left; width: 65%; min-height: 12em; }
.gallery.custom-state-active { background: #eee; }
.gallery li { float: left; width: 96px; padding: 0.4em; margin: 0 0.4em 0.4em 0; text-align: center; }
.gallery li h5 { margin: 0 0 0.4em; cursor: move; }
.gallery li a { float: right; }
.gallery li a.ui-icon-zoomin { float: left; }
.gallery li img { width: 100%; cursor: move; }
- #trash { float: right; width: 32%; min-height: 18em; padding: 1%;} * html #trash { height: 18em; } /* IE6 */
+ #trash { float: right; width: 32%; min-height: 18em; padding: 1%; }
#trash h4 { line-height: 16px; margin: 0 0 0.4em; }
#trash h4 .ui-icon { float: left; }
#trash .gallery h5 { display: none; }
Oops, something went wrong.

0 comments on commit 7ce8e05

Please sign in to comment.