aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demos/bootstrap.js33
-rw-r--r--tests/unit/dialog/options.js4
-rw-r--r--tests/unit/effects/core.js30
-rw-r--r--tests/unit/effects/scale.js2
-rw-r--r--ui/effects/effect-blind.js (renamed from ui/effect-blind.js)4
-rw-r--r--ui/effects/effect-bounce.js (renamed from ui/effect-bounce.js)4
-rw-r--r--ui/effects/effect-clip.js (renamed from ui/effect-clip.js)4
-rw-r--r--ui/effects/effect-drop.js (renamed from ui/effect-drop.js)4
-rw-r--r--ui/effects/effect-explode.js (renamed from ui/effect-explode.js)4
-rw-r--r--ui/effects/effect-fade.js (renamed from ui/effect-fade.js)4
-rw-r--r--ui/effects/effect-fold.js (renamed from ui/effect-fold.js)4
-rw-r--r--ui/effects/effect-highlight.js (renamed from ui/effect-highlight.js)4
-rw-r--r--ui/effects/effect-puff.js (renamed from ui/effect-puff.js)4
-rw-r--r--ui/effects/effect-pulsate.js (renamed from ui/effect-pulsate.js)4
-rw-r--r--ui/effects/effect-scale.js (renamed from ui/effect-scale.js)4
-rw-r--r--ui/effects/effect-shake.js (renamed from ui/effect-shake.js)4
-rw-r--r--ui/effects/effect-size.js (renamed from ui/effect-size.js)4
-rw-r--r--ui/effects/effect-slide.js (renamed from ui/effect-slide.js)4
-rw-r--r--ui/effects/effect-transfer.js (renamed from ui/effect-transfer.js)4
19 files changed, 67 insertions, 62 deletions
diff --git a/demos/bootstrap.js b/demos/bootstrap.js
index 92632919c..a182f7f1c 100644
--- a/demos/bootstrap.js
+++ b/demos/bootstrap.js
@@ -9,20 +9,20 @@ var script = scripts[ scripts.length - 1 ];
var modules = script.getAttribute( "data-modules" );
var pathParts = window.location.pathname.split( "/" );
var effectsAll = [
- "effect-blind",
- "effect-bounce",
- "effect-clip",
- "effect-drop",
- "effect-explode",
- "effect-fade",
- "effect-fold",
- "effect-highlight",
- "effect-puff",
- "effect-pulsate",
- "effect-scale",
- "effect-shake",
- "effect-size",
- "effect-slide"
+ "effects/effect-blind",
+ "effects/effect-bounce",
+ "effects/effect-clip",
+ "effects/effect-drop",
+ "effects/effect-explode",
+ "effects/effect-fade",
+ "effects/effect-fold",
+ "effects/effect-highlight",
+ "effects/effect-puff",
+ "effects/effect-pulsate",
+ "effects/effect-scale",
+ "effects/effect-shake",
+ "effects/effect-size",
+ "effects/effect-slide"
];
var widgets = [
"accordion",
@@ -39,6 +39,11 @@ function getPath( module ) {
return "widgets/" + module;
}
}
+ for ( var j = 0; j < effectsAll.length; j++ ) {
+ if ( module !== "effect" && effectsAll[ j ].indexOf( module ) !== -1 ) {
+ return "effects/" + module;
+ }
+ }
return module;
}
function fixPaths( modules ) {
diff --git a/tests/unit/dialog/options.js b/tests/unit/dialog/options.js
index ea0885de9..c4f1b3e15 100644
--- a/tests/unit/dialog/options.js
+++ b/tests/unit/dialog/options.js
@@ -2,8 +2,8 @@ define( [
"jquery",
"./helper",
"ui/widgets/dialog",
- "ui/effect-blind",
- "ui/effect-explode"
+ "ui/effects/effect-blind",
+ "ui/effects/effect-explode"
], function( $, testHelper ) {
module("dialog: options");
diff --git a/tests/unit/effects/core.js b/tests/unit/effects/core.js
index db83ca093..c8e7c2632 100644
--- a/tests/unit/effects/core.js
+++ b/tests/unit/effects/core.js
@@ -2,21 +2,21 @@ define( [
"jquery",
"lib/common",
"ui/effect",
- "ui/effect-blind",
- "ui/effect-bounce",
- "ui/effect-clip",
- "ui/effect-drop",
- "ui/effect-explode",
- "ui/effect-fade",
- "ui/effect-fold",
- "ui/effect-highlight",
- "ui/effect-puff",
- "ui/effect-pulsate",
- "ui/effect-scale",
- "ui/effect-shake",
- "ui/effect-size",
- "ui/effect-slide",
- "ui/effect-transfer"
+ "ui/effects/effect-blind",
+ "ui/effects/effect-bounce",
+ "ui/effects/effect-clip",
+ "ui/effects/effect-drop",
+ "ui/effects/effect-explode",
+ "ui/effects/effect-fade",
+ "ui/effects/effect-fold",
+ "ui/effects/effect-highlight",
+ "ui/effects/effect-puff",
+ "ui/effects/effect-pulsate",
+ "ui/effects/effect-scale",
+ "ui/effects/effect-shake",
+ "ui/effects/effect-size",
+ "ui/effects/effect-slide",
+ "ui/effects/effect-transfer"
], function( $, common ) {
function present( value, array, message ) {
diff --git a/tests/unit/effects/scale.js b/tests/unit/effects/scale.js
index 186daf09f..0558810c8 100644
--- a/tests/unit/effects/scale.js
+++ b/tests/unit/effects/scale.js
@@ -1,6 +1,6 @@
define( [
"jquery",
- "ui/effect-scale"
+ "ui/effects/effect-scale"
], function( $ ) {
module( "effect.scale: Scale" );
diff --git a/ui/effect-blind.js b/ui/effects/effect-blind.js
index 87382615c..76781f4c7 100644
--- a/ui/effect-blind.js
+++ b/ui/effects/effect-blind.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-bounce.js b/ui/effects/effect-bounce.js
index 80206f62d..06bc84426 100644
--- a/ui/effect-bounce.js
+++ b/ui/effects/effect-bounce.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-clip.js b/ui/effects/effect-clip.js
index c24a764c8..df3a1d644 100644
--- a/ui/effect-clip.js
+++ b/ui/effects/effect-clip.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-drop.js b/ui/effects/effect-drop.js
index fa9ab7346..059fd54ca 100644
--- a/ui/effect-drop.js
+++ b/ui/effects/effect-drop.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-explode.js b/ui/effects/effect-explode.js
index 918ad2c3b..55c247d3e 100644
--- a/ui/effect-explode.js
+++ b/ui/effects/effect-explode.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-fade.js b/ui/effects/effect-fade.js
index 5d0c7caa0..1373ae8a7 100644
--- a/ui/effect-fade.js
+++ b/ui/effects/effect-fade.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-fold.js b/ui/effects/effect-fold.js
index 01aca3a61..2214a1cf3 100644
--- a/ui/effect-fold.js
+++ b/ui/effects/effect-fold.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-highlight.js b/ui/effects/effect-highlight.js
index ed903dc3d..2ab587939 100644
--- a/ui/effect-highlight.js
+++ b/ui/effects/effect-highlight.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-puff.js b/ui/effects/effect-puff.js
index c1640a5d7..bfe922f0c 100644
--- a/ui/effect-puff.js
+++ b/ui/effects/effect-puff.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect",
+ "../version",
+ "../effect",
"./effect-scale"
], factory );
} else {
diff --git a/ui/effect-pulsate.js b/ui/effects/effect-pulsate.js
index 35e6d81ee..9fce19194 100644
--- a/ui/effect-pulsate.js
+++ b/ui/effects/effect-pulsate.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-scale.js b/ui/effects/effect-scale.js
index 8602aeeb4..9e254b27e 100644
--- a/ui/effect-scale.js
+++ b/ui/effects/effect-scale.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect",
+ "../version",
+ "../effect",
"./effect-size"
], factory );
} else {
diff --git a/ui/effect-shake.js b/ui/effects/effect-shake.js
index 0fe27e2b6..ada249aec 100644
--- a/ui/effect-shake.js
+++ b/ui/effects/effect-shake.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-size.js b/ui/effects/effect-size.js
index 0fe8f120f..20af22777 100644
--- a/ui/effect-size.js
+++ b/ui/effects/effect-size.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-slide.js b/ui/effects/effect-slide.js
index 9d62f2228..12e8c9ca8 100644
--- a/ui/effect-slide.js
+++ b/ui/effects/effect-slide.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {
diff --git a/ui/effect-transfer.js b/ui/effects/effect-transfer.js
index 9ac9398c0..38f815875 100644
--- a/ui/effect-transfer.js
+++ b/ui/effects/effect-transfer.js
@@ -19,8 +19,8 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./version",
- "./effect"
+ "../version",
+ "../effect"
], factory );
} else {