Merge branch 'release/2.24.3'

zhenwenliOS · Dec 18, 2015 · 8ae5e31 · 8ae5e31
2 parents 14bff18 + 87649e2
commit 8ae5e31
Show file tree

Hide file tree

Showing 19 changed files with 156 additions and 483 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+### 2.24.3 (December 18, 2015)
+
+  - Added support for using data-title attribute as lightbox caption
+  - Added mark first item in a row with ```uk-row-first``` when data-uk-grid-margin
+  - Added uk-slide-before uk-slide-after classes to slider element after item focus
+  - Added oncancel callback to UIkit.modal.confirm
+  - Updated allow params in data-uk-* attributes without curly braces
+  - Fixed .uk-display-inline-block with responsive child images (firefox)
+  - Fixed hash urls in Offcanvas
+  - Fixed slideshow scroll, swipe direction
+
 ### 2.24.2 (December 01, 2015)
 
   - Fixed UIkit.Utils.stackMargin apply on container with only one child element

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "uikit",
-  "version": "2.24.2",
+  "version": "2.24.3",
   "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.2",
+    "version": "2.24.3",
     "keywords": [],
     "homepage": "http://getuikit.com/",
     "authors": [],

diff --git a/docs/css/uikit.docs.min.css b/docs/css/uikit.docs.min.css
diff --git a/docs/js/uikit.min.js b/docs/js/uikit.min.js
diff --git a/docs/modal.html b/docs/modal.html
@@ -418,7 +418,7 @@ <h3 class="tm-article-subtitle">Example</h3>
 
 <pre><code>UIkit.modal.confirm("Are you sure?", function(){
     // will be executed on confirm.
-});</code></pre>
+}[, oncanel, options]);</code></pre>
 
                         <button type="button" class="uk-button" onclick="UIkit.modal.prompt('Name:', '', function(val){ UIkit.modal.alert('Hello '+(val || 'Mr noname')+'!'); });">Prompt</button>
 

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.2",
+  "version": "2.24.3",
   "homepage": "http://www.getuikit.com",
   "author": {
     "name": "UIkit",

diff --git a/src/js/components/lightbox.js b/src/js/components/lightbox.js
@@ -84,7 +84,7 @@
 
                     siblings.push({
                         'source': ele.attr('href'),
-                        'title' : ele.attr('title'),
+                        'title' : ele.attr('data-title') || ele.attr('title'),
                         'type'  : ele.attr("data-lightbox-type") || 'auto',
                         'link'  : ele
                     });

diff --git a/src/js/components/parallax.js b/src/js/components/parallax.js
@@ -300,7 +300,7 @@
             h += extra;
             w += Math.ceil(extra * ratio);
 
-            if (w > size.w && h < size.h) {
+            if (w-extra > size.w && h < size.h) {
                 return obj.element.css({'background-size': ''});
             }
 

diff --git a/src/js/components/slider.js b/src/js/components/slider.js
@@ -184,7 +184,7 @@
 
             this.container.css({'min-width': pos, 'min-height': maxheight});
 
-            if (this.options.infinite && pos <= (2*this.vp) && !this.itemsResized) {
+            if (this.options.infinite && (pos <= (2*this.vp) || this.items.length < 5) && !this.itemsResized) {
 
                 // fill with cloned items
                 this.container.children().each(function(idx){
@@ -291,6 +291,15 @@
                 }
             }
 
+            // mark elements
+            var left = this.items.eq(idx).data('left');
+
+            this.items.removeClass('uk-slide-before uk-slide-after').each(function(i){
+                if (i!==idx) {
+                    UI.$(this).addClass(UI.$(this).data('left') < left ? 'uk-slide-before':'uk-slide-after');
+                }
+            });
+
             this.focus = idx;
 
             this.trigger('focusitem.uk.slider', [idx,this.items.eq(idx),this]);

diff --git a/src/js/components/slideshow.js b/src/js/components/slideshow.js
@@ -287,7 +287,7 @@
             var $this        = this,
                 current      = this.slides.eq(this.current),
                 next         = this.slides.eq(index),
-                dir          = direction ? direction : this.current < index ? -1 : 1,
+                dir          = direction ? direction : this.current < index ? 1 : -1,
                 currentmedia = current.data('media'),
                 animation    = Animations[this.options.animation] ? this.options.animation : 'fade',
                 nextmedia    = next.data('media'),
@@ -443,14 +443,14 @@
 
             next.css('opacity', 1).one(UI.support.animation.end, function() {
 
-                current.removeClass(dir === 1 ? 'uk-slideshow-scroll-backward-out' : 'uk-slideshow-scroll-forward-out');
-                next.css('opacity', '').removeClass(dir === 1 ? 'uk-slideshow-scroll-backward-in' : 'uk-slideshow-scroll-forward-in');
+                current.removeClass(dir == -1 ? 'uk-slideshow-scroll-backward-out' : 'uk-slideshow-scroll-forward-out');
+                next.css('opacity', '').removeClass(dir == -1 ? 'uk-slideshow-scroll-backward-in' : 'uk-slideshow-scroll-forward-in');
                 d.resolve();
 
             }.bind(this));
 
-            current.addClass(dir == 1 ? 'uk-slideshow-scroll-backward-out' : 'uk-slideshow-scroll-forward-out');
-            next.addClass(dir == 1 ? 'uk-slideshow-scroll-backward-in' : 'uk-slideshow-scroll-forward-in');
+            current.addClass(dir == -1 ? 'uk-slideshow-scroll-backward-out' : 'uk-slideshow-scroll-forward-out');
+            next.addClass(dir == -1 ? 'uk-slideshow-scroll-backward-in' : 'uk-slideshow-scroll-forward-in');
             next.width(); // force redraw
 
             return d.promise();
@@ -465,14 +465,14 @@
 
             next.css('opacity', 1).one(UI.support.animation.end, function() {
 
-                current.removeClass(dir === 1 ? 'uk-slideshow-swipe-backward-out' : 'uk-slideshow-swipe-forward-out');
-                next.css('opacity', '').removeClass(dir === 1 ? 'uk-slideshow-swipe-backward-in' : 'uk-slideshow-swipe-forward-in');
+                current.removeClass(dir === -1 ? 'uk-slideshow-swipe-backward-out' : 'uk-slideshow-swipe-forward-out');
+                next.css('opacity', '').removeClass(dir === -1 ? 'uk-slideshow-swipe-backward-in' : 'uk-slideshow-swipe-forward-in');
                 d.resolve();
 
             }.bind(this));
 
-            current.addClass(dir == 1 ? 'uk-slideshow-swipe-backward-out' : 'uk-slideshow-swipe-forward-out');
-            next.addClass(dir == 1 ? 'uk-slideshow-swipe-backward-in' : 'uk-slideshow-swipe-forward-in');
+            current.addClass(dir == -1 ? 'uk-slideshow-swipe-backward-out' : 'uk-slideshow-swipe-forward-out');
+            next.addClass(dir == -1 ? 'uk-slideshow-swipe-backward-in' : 'uk-slideshow-swipe-forward-in');
             next.width(); // force redraw
 
             return d.promise();

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.2';
+    UI.version = '2.24.3';
 
     UI.noConflict = function() {
         // restore UIkit version
@@ -259,7 +259,11 @@
 
     UI.Utils.options = function(string) {
 
-        if ($.isPlainObject(string)) return string;
+        if ($.type(string)!='string') return string;
+
+        if (string.indexOf(':') != -1 && string.trim().substr(-1) != '}') {
+            string = '{'+string+'}';
+        }
 
         var start = (string ? string.indexOf("{") : -1), options = {};
 
@@ -617,86 +621,96 @@
         if (UI.domready) UI.Utils.checkDisplay();
     });
 
-    $(function(){
+    document.addEventListener('DOMContentLoaded', function(){
 
-        UI.$body = UI.$('body');
+        var domReady = function() {
 
-        UI.ready(function(context){
-            UI.domObserve('[data-uk-observe]');
-        });
+            UI.$body = UI.$('body');
 
-        UI.on('changed.uk.dom', function(e) {
-            UI.init(e.target);
-            UI.Utils.checkDisplay(e.target);
-        });
+            UI.ready(function(context){
+                UI.domObserve('[data-uk-observe]');
+            });
 
-        UI.trigger('beforeready.uk.dom');
+            UI.on('changed.uk.dom', function(e) {
+                UI.init(e.target);
+                UI.Utils.checkDisplay(e.target);
+            });
 
-        UI.component.bootComponents();
+            UI.trigger('beforeready.uk.dom');
 
-        // custom scroll observer
-        requestAnimationFrame((function(){
+            UI.component.bootComponents();
 
-            var memory = {x: window.pageXOffset, y:window.pageYOffset}, dir;
+            // custom scroll observer
+            requestAnimationFrame((function(){
 
-            var fn = function(){
+                var memory = {x: window.pageXOffset, y:window.pageYOffset}, dir;
 
-                if (memory.x != window.pageXOffset || memory.y != window.pageYOffset) {
+                var fn = function(){
 
-                    dir = {x: 0 , y: 0};
+                    if (memory.x != window.pageXOffset || memory.y != window.pageYOffset) {
 
-                    if (window.pageXOffset != memory.x) dir.x = window.pageXOffset > memory.x ? 1:-1;
-                    if (window.pageYOffset != memory.y) dir.y = window.pageYOffset > memory.y ? 1:-1;
+                        dir = {x: 0 , y: 0};
 
-                    memory = {
-                        "dir": dir, "x": window.pageXOffset, "y": window.pageYOffset
-                    };
+                        if (window.pageXOffset != memory.x) dir.x = window.pageXOffset > memory.x ? 1:-1;
+                        if (window.pageYOffset != memory.y) dir.y = window.pageYOffset > memory.y ? 1:-1;
 
-                    UI.$doc.trigger('scrolling.uk.document', [memory]);
-                }
+                        memory = {
+                            "dir": dir, "x": window.pageXOffset, "y": window.pageYOffset
+                        };
 
-                requestAnimationFrame(fn);
-            };
+                        UI.$doc.trigger('scrolling.uk.document', [memory]);
+                    }
 
-            if (UI.support.touch) {
-                UI.$html.on('touchmove touchend MSPointerMove MSPointerUp pointermove pointerup', fn);
-            }
+                    requestAnimationFrame(fn);
+                };
 
-            if (memory.x || memory.y) fn();
+                if (UI.support.touch) {
+                    UI.$html.on('touchmove touchend MSPointerMove MSPointerUp pointermove pointerup', fn);
+                }
+
+                if (memory.x || memory.y) fn();
 
-            return fn;
+                return fn;
 
-        })());
+            })());
 
-        // run component init functions on dom
-        UI.trigger('domready.uk.dom');
+            // run component init functions on dom
+            UI.trigger('domready.uk.dom');
 
-        if (UI.support.touch) {
+            if (UI.support.touch) {
 
-            // remove css hover rules for touch devices
-            // UI.Utils.removeCssRules(/\.uk-(?!navbar).*:hover/);
+                // remove css hover rules for touch devices
+                // UI.Utils.removeCssRules(/\.uk-(?!navbar).*:hover/);
 
-            // viewport unit fix for uk-height-viewport - should be fixed in iOS 8
-            if (navigator.userAgent.match(/(iPad|iPhone|iPod)/g)) {
+                // viewport unit fix for uk-height-viewport - should be fixed in iOS 8
+                if (navigator.userAgent.match(/(iPad|iPhone|iPod)/g)) {
 
-                UI.$win.on('load orientationchange resize', UI.Utils.debounce((function(){
+                    UI.$win.on('load orientationchange resize', UI.Utils.debounce((function(){
 
-                    var fn = function() {
-                        $('.uk-height-viewport').css('height', window.innerHeight);
-                        return fn;
-                    };
+                        var fn = function() {
+                            $('.uk-height-viewport').css('height', window.innerHeight);
+                            return fn;
+                        };
 
-                    return fn();
+                        return fn();
 
-                })(), 100));
+                    })(), 100));
+                }
             }
+
+            UI.trigger('afterready.uk.dom');
+
+            // mark that domready is left behind
+            UI.domready = true;
+        };
+
+        if (document.readyState == 'complete' || document.readyState == 'interactive') {
+            setTimeout(domReady);
         }
 
-        UI.trigger('afterready.uk.dom');
+        return domReady;
 
-        // mark that domready is left behind
-        UI.domready = true;
-    });
+    }());
 
     // add touch identifier class
     UI.$html.addClass(UI.support.touch ? "uk-touch" : "uk-notouch");

diff --git a/src/js/core/grid.js b/src/js/core/grid.js
@@ -86,7 +86,8 @@
     UI.component('gridMargin', {
 
         defaults: {
-            "cls": "uk-grid-margin"
+            cls      : 'uk-grid-margin',
+            rowfirst : 'uk-row-first'
         },
 
         boot: function() {

diff --git a/src/js/core/modal.js b/src/js/core/modal.js
@@ -279,18 +279,21 @@
         return modal.show();
     };
 
-    UI.modal.confirm = function(content, onconfirm, options) {
+    UI.modal.confirm = function(content, onconfirm, oncancel) {
+
+        var options = arguments.length > 1 && arguments[arguments.length-1] ? arguments[arguments.length-1] : {};
 
         onconfirm = UI.$.isFunction(onconfirm) ? onconfirm : function(){};
-        options   = UI.$.extend(true, {bgclose:false, keyboard:false, modal:false, labels:UI.modal.labels}, options);
+        oncancel  = UI.$.isFunction(oncancel) ? oncancel : function(){};
+        options   = UI.$.extend(true, {bgclose:false, keyboard:false, modal:false, labels:UI.modal.labels}, UI.$.isFunction(options) ? {}:options);
 
         var modal = UI.modal.dialog(([
             '<div class="uk-margin uk-modal-content">'+String(content)+'</div>',
-            '<div class="uk-modal-footer uk-text-right"><button class="uk-button uk-modal-close">'+options.labels.Cancel+'</button> <button class="uk-button uk-button-primary js-modal-confirm">'+options.labels.Ok+'</button></div>'
+            '<div class="uk-modal-footer uk-text-right"><button class="uk-button js-modal-confirm-cancel">'+options.labels.Cancel+'</button> <button class="uk-button uk-button-primary js-modal-confirm">'+options.labels.Ok+'</button></div>'
         ]).join(""), options);
 
-        modal.element.find(".js-modal-confirm").on("click", function(){
-            onconfirm();
+        modal.element.find(".js-modal-confirm, .js-modal-confirm-cancel").on("click", function(){
+            UI.$(this).is('.js-modal-confirm') ? onconfirm() : oncancel();
             modal.hide();
         });
 

diff --git a/src/js/core/offcanvas.js b/src/js/core/offcanvas.js
@@ -97,7 +97,7 @@
                 Offcanvas.hide();
             });
 
-            element.on("click", "a[href^='#']", function(e){
+            element.on("click", "a[href*='#']", function(e){
 
                 var link = UI.$(this),
                     href = link.attr("href");
@@ -111,16 +111,16 @@
                     var target;
 
                     try {
-                        target = UI.$(href);
+                        target = UI.$(link[0].hash);
                     } catch (e){
-                        target = "";
+                        target = '';
                     }
 
                     if (!target.length) {
-                        target = UI.$('[name="'+href.replace('#','')+'"]');
+                        target = UI.$('[name="'+link[0].hash.replace('#','')+'"]');
                     }
 
-                    if (target.length && link.attr('data-uk-smooth-scroll') && UI.Utils.scrollToElement) {
+                    if (target.length && UI.Utils.scrollToElement) {
                         UI.Utils.scrollToElement(target, UI.Utils.options(link.attr('data-uk-smooth-scroll') || '{}'));
                     } else {
                         window.location.href = href;