Merge branch 'release/2.24.2'

zhenwenliOS · Dec 1, 2015 · 14bff18 · 14bff18
2 parents 9251f52 + 7853c5e
commit 14bff18
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### 2.24.2 (December 01, 2015)
+
+  - Fixed UIkit.Utils.stackMargin apply on container with only one child element
+  - Fixed hiding dropdown on click with option `mode:'hover'` for dropdown or items with class `uk-dropdown-close`
+
 ### 2.24.1 (November 30, 2015)
 
   - Added uk-width-xlarge-* classes

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "uikit",
-  "version": "2.24.1",
+  "version": "2.24.2",
   "homepage": "http://getuikit.com",
   "main": [
       "./dist/css/uikit.min.css",

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "uikit/uikit",
     "type": "library",
     "description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
-    "version": "2.24.1",
+    "version": "2.24.2",
     "keywords": [],
     "homepage": "http://getuikit.com/",
     "authors": [],

diff --git a/docs/dropdown.html b/docs/dropdown.html
@@ -1127,6 +1127,12 @@ <h3 class="tm-article-subtitle">Example</h3>
 });
 </code></pre>
 
+                            <hr class="uk-article-divider">
+
+                            <h2 id="css-options"><a href="#css-options" class="uk-link-reset">CSS options</a></h2>
+
+                            <p>Add class <code>.uk-dropdown-close</code> to dropdown container or to item to hide dropdown when user click on item.</p>
+
                         </article>
 
                     </div>

diff --git a/docs/js/uikit.min.js b/docs/js/uikit.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "uikit",
   "title": "UIkit",
   "description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
-  "version": "2.24.1",
+  "version": "2.24.2",
   "homepage": "http://www.getuikit.com",
   "author": {
     "name": "UIkit",

diff --git a/src/js/components/sticky.js b/src/js/components/sticky.js
@@ -52,8 +52,8 @@
                 if (!sticked.length) return;
 
                 for (var i = 0; i < sticked.length; i++) {
-                    //sticked[i].reset(true);
-                    sticked[i].self.computeWrapper();
+                    sticked[i].reset(true);
+                    //sticked[i].self.computeWrapper();
                 }
 
                 checkscrollposition();

diff --git a/src/js/core/core.js b/src/js/core/core.js
@@ -43,7 +43,7 @@
 
     var UI = {}, _UI = global.UIkit ? Object.create(global.UIkit) : undefined;
 
-    UI.version = '2.24.1';
+    UI.version = '2.24.2';
 
     UI.noConflict = function() {
         // restore UIkit version

diff --git a/src/js/core/dropdown.js b/src/js/core/dropdown.js
@@ -189,6 +189,9 @@
                     }
 
                     if (active && active == $this) {
+                        if (!$this.dropdown.find(e.target).length || $target.is(".uk-dropdown-close") || $target.parents(".uk-dropdown-close").length) {
+                            $this.hide();
+                        }
                         return;
                     }
 

diff --git a/src/js/core/utility.js b/src/js/core/utility.js
@@ -159,7 +159,7 @@
             firstvisible = elements.filter(":visible:first"),
             offset       = firstvisible.length ? (firstvisible.position().top + firstvisible.outerHeight()) - 1 : false; // (-1): weird firefox bug when parent container is display:flex
 
-        if (offset === false) return;
+        if (offset === false || elements.length == 1) return;
 
         elements.each(function() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -189,6 +189,9 @@ @@
                         }
                         if (active && active == $this) {
+                            if (!$this.dropdown.find(e.target).length || $target.is(".uk-dropdown-close") || $target.parents(".uk-dropdown-close").length) {
+                                $this.hide();
+                            }
                             return;
                         }
@@ Expand Down @@