diff --git a/Gruntfile.js b/Gruntfile.js index fe6b588b2..0c9bf4447 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -147,15 +147,12 @@ grunt.initConfig({ }, uglify: minify, htmllint: { - good: [ "tests/**/*.html" ].concat( htmllintBad.map( function( file ) { - return "!" + file; - } ) ), - demos: { + good: { options: { ignore: [ /The text content of element “script” was not in the required format: Expected space, tab, newline, or slash but found “.” instead/ ] }, - src: [ "demos/**/*.html" ].concat( htmllintBad.map( function( file ) { + src: [ "demos/**/*.html", "tests/**/*.html" ].concat( htmllintBad.map( function( file ) { return "!" + file; } ) ) }, diff --git a/demos/bootstrap.js b/demos/bootstrap.js index b96620d6a..7a942374d 100644 --- a/demos/bootstrap.js +++ b/demos/bootstrap.js @@ -7,6 +7,7 @@ var script = scripts[ scripts.length - 1 ]; // Read the modules var modules = script.getAttribute( "data-modules" ); +var composite = script.getAttribute( "data-composite" ) || false; var pathParts = window.location.pathname.split( "/" ); var effectsAll = [ "effects/effect-blind", @@ -22,7 +23,8 @@ var effectsAll = [ "effects/effect-scale", "effects/effect-shake", "effects/effect-size", - "effects/effect-slide" + "effects/effect-slide", + "effects/effect-transfer" ]; var widgets = [ "accordion", @@ -52,8 +54,13 @@ function getPath( module ) { } } for ( var j = 0; j < effectsAll.length; j++ ) { - if ( module !== "effect" && effectsAll[ j ].indexOf( module ) !== -1 ) { - return "effects/" + module; + if ( module !== "effect" ) { + if ( effectsAll[ j ] === module ) { + return module; + } + if ( effectsAll[ j ].indexOf( module ) !== -1 ) { + return "effects/" + module; + } } } return module; @@ -69,7 +76,7 @@ function fixPaths( modules ) { document.documentElement.className = "demo-loading"; require.config( { - baseUrl: "../../ui", + baseUrl: window.location.pathname.indexOf( "demos/" ) !== -1 ? "../../ui" : "../../../ui", paths: { jquery: "../external/jquery/jquery", external: "../external/" @@ -86,7 +93,9 @@ if ( modules && modules.indexOf( "effects-all" ) !== -1 ) { } modules = modules ? modules.replace( /^\s+|\s+$/g, "" ).split( /\s+/ ) : []; -modules.push( pathParts[ pathParts.length - 2 ] ); +if ( !composite ) { + modules.push( pathParts[ pathParts.length - 2 ] ); +} modules = fixPaths( modules ); require( modules, function() { diff --git a/tests/visual/accordion/icons.html b/tests/visual/accordion/icons.html index a8723a859..b0ae18c65 100644 --- a/tests/visual/accordion/icons.html +++ b/tests/visual/accordion/icons.html @@ -4,12 +4,8 @@ Accordion Visual Test - - - - - + diff --git a/tests/visual/addClass/queue.html b/tests/visual/addClass/queue.html index 88611ddc4..c939dce91 100644 --- a/tests/visual/addClass/queue.html +++ b/tests/visual/addClass/queue.html @@ -4,8 +4,6 @@ addClass Visual Test : Queue - - - + diff --git a/tests/visual/button/button.html b/tests/visual/button/button.html index 3ac055b91..1d82cf665 100644 --- a/tests/visual/button/button.html +++ b/tests/visual/button/button.html @@ -4,12 +4,8 @@ Button Visual Test - - - - - + diff --git a/tests/visual/button/performance.html b/tests/visual/button/performance.html index ba90965a9..0d807d167 100644 --- a/tests/visual/button/performance.html +++ b/tests/visual/button/performance.html @@ -4,12 +4,8 @@ Button Visual Test: Initialization Performance - - - - - + diff --git a/tests/visual/compound/accordion_tabs.html b/tests/visual/compound/accordion_tabs.html index 68207d151..3f2f93712 100644 --- a/tests/visual/compound/accordion_tabs.html +++ b/tests/visual/compound/accordion_tabs.html @@ -5,16 +5,10 @@ Compound Visual Test : Accordion in Tabs - - - - - - + diff --git a/tests/visual/compound/datepicker_dialog.html b/tests/visual/compound/datepicker_dialog.html index 52c91a083..ba1a1de7e 100644 --- a/tests/visual/compound/datepicker_dialog.html +++ b/tests/visual/compound/datepicker_dialog.html @@ -5,21 +5,10 @@ Compound Visual Test : Datepicker in Dialog - - - - - - - - - - - + diff --git a/tests/visual/compound/dialog_widgets.html b/tests/visual/compound/dialog_widgets.html index 2258231e9..f84ef0123 100644 --- a/tests/visual/compound/dialog_widgets.html +++ b/tests/visual/compound/dialog_widgets.html @@ -5,26 +5,10 @@ Compound Visual Test : All Widgets in Dialog - - - - - - - - - - - - - - - - - - - + diff --git a/tests/visual/compound/draggable_accordion.html b/tests/visual/compound/draggable_accordion.html index 528cdc321..345c0b038 100644 --- a/tests/visual/compound/draggable_accordion.html +++ b/tests/visual/compound/draggable_accordion.html @@ -5,20 +5,15 @@ Compound Visual Test : Draggable in Accordion - - - - - - - + diff --git a/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html b/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html index 302a2e910..bfc5f81e6 100644 --- a/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html +++ b/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html @@ -5,13 +5,6 @@ Compound Visual Test : Draggable in Accordion - - - - - - - - + diff --git a/tests/visual/compound/draggable_resizable.html b/tests/visual/compound/draggable_resizable.html index d07c8bdc4..539091b7f 100644 --- a/tests/visual/compound/draggable_resizable.html +++ b/tests/visual/compound/draggable_resizable.html @@ -5,12 +5,6 @@ Compound Visual Test: Draggable and Resizable block element - - - - - - - + diff --git a/tests/visual/compound/sortable_accordion_sortable_tabs.html b/tests/visual/compound/sortable_accordion_sortable_tabs.html index f44f2b929..9ccc36751 100644 --- a/tests/visual/compound/sortable_accordion_sortable_tabs.html +++ b/tests/visual/compound/sortable_accordion_sortable_tabs.html @@ -5,15 +5,9 @@ Compound Visual Test : Accordion in Tabs - - - - - - - - + diff --git a/tests/visual/compound/tabs_selectmenu.html b/tests/visual/compound/tabs_selectmenu.html index ca2020b71..ddd72c75f 100644 --- a/tests/visual/compound/tabs_selectmenu.html +++ b/tests/visual/compound/tabs_selectmenu.html @@ -5,18 +5,10 @@ Compound Visual Test : Selectmenu in Tabs - - - - - - - - + + + - diff --git a/tests/visual/effects/shake.html b/tests/visual/effects/shake.html index 29159e39d..c93f0eb57 100644 --- a/tests/visual/effects/shake.html +++ b/tests/visual/effects/shake.html @@ -4,20 +4,6 @@ jQuery UI Effects Test Suite - - - - - + + diff --git a/tests/visual/index.html b/tests/visual/index.html index 4979921a4..98753c827 100644 --- a/tests/visual/index.html +++ b/tests/visual/index.html @@ -89,6 +89,7 @@
  • Nested Widgets
  • Draggable Resizable
  • Sortable Tabs in Sortable Accordion
    • +
  • Selectmenu in Tabs
  • Nested Tabs
  • Tabs with Tooltips
    • diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html index c71f50ff4..9bbaa95e1 100644 --- a/tests/visual/menu/menu.html +++ b/tests/visual/menu/menu.html @@ -4,13 +4,15 @@ Menu Visual Test: Default - - - - - - + - diff --git a/tests/visual/position/position.html b/tests/visual/position/position.html index 70a9c40e5..d5c19fd32 100644 --- a/tests/visual/position/position.html +++ b/tests/visual/position/position.html @@ -3,12 +3,6 @@ Position Visual Test - - - - - - - + diff --git a/tests/visual/position/position_feedback.html b/tests/visual/position/position_feedback.html index 988451026..f094b5148 100644 --- a/tests/visual/position/position_feedback.html +++ b/tests/visual/position/position_feedback.html @@ -4,13 +4,67 @@ Position Visual Test: Feedback - - - - - - + - diff --git a/tests/visual/selectmenu/selectmenu.html b/tests/visual/selectmenu/selectmenu.html index f91894710..693885d25 100644 --- a/tests/visual/selectmenu/selectmenu.html +++ b/tests/visual/selectmenu/selectmenu.html @@ -4,14 +4,18 @@ Selectmenu Visual Test: Default - - - - - - - + - diff --git a/tests/visual/slider/range_slider.html b/tests/visual/slider/range_slider.html index 2b041f377..64152a9ff 100644 --- a/tests/visual/slider/range_slider.html +++ b/tests/visual/slider/range_slider.html @@ -11,11 +11,23 @@ margin: 20px auto; } - - - - - + +
    @@ -26,22 +38,5 @@
    - - diff --git a/tests/visual/tooltip/animations.html b/tests/visual/tooltip/animations.html index 6131db436..7427d7ebd 100644 --- a/tests/visual/tooltip/animations.html +++ b/tests/visual/tooltip/animations.html @@ -4,16 +4,6 @@ Tooltip Visual Test: Animations - - - - - - - - - - - + 
    {}
    {
-  "show": {
-    "effect": "slideDown"
-  },
-  "hide": {
-    "effect": "slideUp"
-  }
+	"show": {
+		"effect": "slideDown"
+	},
+	"hide": {
+		"effect": "slideUp"
+	}
 }
    {
-  "show": {
-    "effect": "explode"
-  },
-  "hide": {
-    "effect": "explode"
-  }
+	"show": {
+		"effect": "explode"
+	},
+	"hide": {
+		"effect": "explode"
+	}
 }
    {
-  "show": {
-    "effect": "bounce"
-  },
-  "hide": {
-    "effect": "blind"
-  }
+	"show": {
+		"effect": "bounce"
+	},
+	"hide": {
+		"effect": "blind"
+	}
 }
    {
-  "show": {
-    "effect": "drop",
-    "direction": "right"
-  },
-  "hide": {
-    "effect": "drop",
-    "direction": "right"
-  }
+	"show": {
+		"effect": "drop",
+		"direction": "right"
+	},
+	"hide": {
+		"effect": "drop",
+		"direction": "right"
+	}
 }
    diff --git a/tests/visual/tooltip/tooltip.html b/tests/visual/tooltip/tooltip.html index 176af85d8..9453190d7 100644 --- a/tests/visual/tooltip/tooltip.html +++ b/tests/visual/tooltip/tooltip.html @@ -4,19 +4,13 @@ Tooltip Visual Test: Default - - - - - - - +