Display toggling fix

To have display set to an auto value, pass in “auto” instead of empty quotes (“”).
julianshapiro · Jul 10, 2014 · ed5a9c3 · ed5a9c3
1 parent 160e12d
commit ed5a9c3
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "velocity",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "homepage": "http://velocityjs.org",
   "authors": [
     { "name" : "Julian Shapiro",

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "velocity",
   "repository": "julianshapiro/velocity",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Accelerated JavaScript animation.",
   "keywords": [
     "animation",

diff --git a/jquery.velocity.js b/jquery.velocity.js
@@ -4,7 +4,7 @@
 
 /*!
 * Velocity.js: Accelerated JavaScript animation.
-* @version 0.5.0
+* @version 0.5.2
 * @docs http://velocityjs.org
 * @license Copyright 2014 Julian Shapiro. MIT License: http://en.wikipedia.org/wiki/MIT_License
 */
@@ -241,7 +241,7 @@ Velocity's structure:
         animate: function () { /* Defined below. */ },
         /* Set to true to force a duration of 1ms for all animations so that UI testing can be performed without waiting on animations to complete. */
         mock: false,
-        version: { major: 0, minor: 5, patch: 0 },
+        version: { major: 0, minor: 5, patch: 2 },
         /* Set to 1 or 2 (most verbose) to output debug info to console. */
         debug: false
     };
@@ -1877,6 +1877,10 @@ Velocity's structure:
             /* Refer to Velocity's documentation (VelocityJS.org/#display) for a description of the display option's behavior. */
             if (opts.display) {
                 opts.display = opts.display.toString().toLowerCase();
+
+                if (opts.display === "auto") {
+                    opts.display = Velocity.CSS.Values.getDisplayType(element);
+                }
             }
 
             /**********************
@@ -3142,7 +3146,7 @@ Velocity's structure:
                 if (direction === "Down") {
                     /* All sliding elements are set to the "block" display value (as opposed to an element-appropriate block/inline distinction)
                        because inline elements cannot actually have their dimensions modified. */
-                    opts.display = opts.display || Velocity.CSS.Values.getDisplayType(element);
+                    opts.display = opts.display || "auto";
                 } else {
                     opts.display = opts.display || "none";
                 }
@@ -3256,8 +3260,8 @@ Velocity's structure:
             /* If a display was passed in, use it. Otherwise, default to "none" for fadeOut or the element-specific default for fadeIn. */
             /* Note: We allow users to pass in "null" to skip display setting altogether. */
             if (opts.display !== null) {
-                opts.display = (direction === "In") ? Velocity.CSS.Values.getDisplayType(element) : "none";
-                //opts.display = opts.display || ((direction === "In") ? Velocity.CSS.Values.getDisplayType(element) : "none");
+                opts.display = (direction === "In") ? "auto" : "none";
+                //opts.display = opts.display || ((direction === "In") ? "auto" : "none");
             }
 
             Velocity.animate(this, propertiesMap, opts);

diff --git a/jquery.velocity.min.js b/jquery.velocity.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "velocity-animate",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Accelerated JavaScript animation.",
   "keywords": [
     "velocity",

diff --git a/velocity.ui.js b/velocity.ui.js
@@ -4,7 +4,7 @@
 
 /*!
 * velocity.ui.js: UI effects pack for Velocity. Load this file after jquery.velocity.js.
-* @version 4.0.1
+* @version 4.0.3
 * @docs http://velocityjs.org/#uiPack
 * @support <=IE8: Callouts will have no effect, and transitions will simply fade in/out. IE9/Android 2.3: Most effects are fully supported, the rest fade in/out. All other browsers: Full support.
 * @license Copyright Julian Shapiro. MIT License: http://en.wikipedia.org/wiki/MIT_License
@@ -26,8 +26,8 @@
         return;
     }
 
-    if (!Container.Velocity.version) {
-        var abortError = "Velocity UI Pack: You need to update your jquery.velocity.js to a newer version. Visit http://github.com/julianshapiro/velocity.";
+    if (!Container.Velocity.version || (Container.Velocity.version.major <= 0 && Container.Velocity.version.minor <= 5 && Container.Velocity.version.patch <= 1)) {
+        var abortError = "Velocity UI Pack: You need to update Velocity (jquery.velocity.js) to a newer version. Visit http://github.com/julianshapiro/velocity.";
 
         alert(abortError);
         throw new Error(abortError);
@@ -112,7 +112,7 @@
                         if (sequenceOptions.display && sequenceOptions.display !== "none") {
                             opts.display = sequenceOptions.display;
                         } else if (/In$/.test(effectName)) {
-                            opts.display = Container.Velocity.CSS.Values.getDisplayType(element);
+                            opts.display = "auto";
                         }
                     }
                 }