uikit-sass-rails 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b626e9b61642192657b57527e121206bfa6b6152
-  data.tar.gz: bd17764a5fe56abfe8d47bc9b6d178e57d04f4c9
+  metadata.gz: a17b855a151e036a73e030ecac26f9aa527a9179
+  data.tar.gz: 56e13192263bf1d978b7fa3798429bcac2281e27
 SHA512:
-  metadata.gz: 9deb1dd9e1dc01e1c444d8c71ea60d15fc3b1ee42be5571ea3d23b47a63f8818ad0d198b81f995911778f81a7af3954e35c111a6763f4fbb013ddc2e035b7738
-  data.tar.gz: 3174e72246f7db3686b6fa46a55ef80a36ddccee1daaeb4c0f8fa8f0220e09ce28d18ace8520854b1f44772b0294c4d4137bb54c4bd6de3ecea8500bfe18d451
+  metadata.gz: 8e6605cc259f223b2cd5a4ba0ae4df9d7e19988b3ebfc62d5f6096db90cd466726d94b92506284c3d3fa2cd4440b0f88508e378f66285e20b8bbe2326c1da637
+  data.tar.gz: e6a2bd8db05b3d89fd592f6d5136f151472a0df1c93d6def12f697db6680857557056a851f1f978062466d98f6896c1be3d9fa008ec540df7dc57de881d935d5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.3.0
+- UIkit 2.11.1
+
 ## 1.2.0
 - UIkit 2.10.0
 - Bugfix: Autocomplete

data/README.md

@@ -1,6 +1,7 @@
 # Uikit::Sass:Rails
 
-[![Gem Version](https://badge.fury.io/rb/uikit-sass-rails.svg)](http://badge.fury.io/rb/uikit-sass-rails)
+[![Gem: Version 1.3](https://img.shields.io/gem/v/uikit-sass-rails.svg?style=flat-square)](https://rubygems.org/gems/uikit-sass-rails)
+[![License: EUPL-1.1](https://img.shields.io/badge/license-EUPL--1.1-red.svg?style=flat-square)](https://github.com/marsec/uikit-sass-rails/blob/master/LICENSE.md)
 
 Uikit::Sass:Rails is a gem to make it super easy to use UIkit in your Rails project. It is written in Sass and compatible with the asset pipeline in Rails. You can start using Uikit::Sass:Rails in your projects by following the instructions below.
 

data/lib/uikit/sass/rails/engine.rb

@@ -4,7 +4,7 @@ module Uikit
       class Engine < ::Rails::Engine
         isolate_namespace Uikit::Sass::Rails
         initializer 'uikitkit-sass-rails.assets.precompile' do |app|
-          app.config.assets.precompile += %w(fontawesome-webfont.eot fontawesome-webfont.svg fontawesome-webfont.ttf fontawesome-webfont.woff)
+          app.config.assets.precompile += %w(fontawesome-webfont.eot fontawesome-webfont.otf fontawesome-webfont.svg fontawesome-webfont.ttf fontawesome-webfont.woff)
         end
       end
     end

data/lib/uikit/sass/rails/version.rb

@@ -1,7 +1,7 @@
 module Uikit
   module Sass
     module Rails
-      VERSION = '1.2.0'
+      VERSION = '1.3.0'
     end
   end
 end

data/vendor/assets/javascripts/uikit.js

@@ -1,16 +1,16 @@
 //= require uikit/uikit
 
-//= require uikit/addons/autocomplete
-//= require uikit/addons/cover
-//= require uikit/addons/datepicker
-//= require uikit/addons/form-password
-//= require uikit/addons/form-select
-//= require uikit/addons/htmleditor
-//= require uikit/addons/nestable
-//= require uikit/addons/notify
-//= require uikit/addons/pagination
-//= require uikit/addons/search
-//= require uikit/addons/sortable
-//= require uikit/addons/sticky
-//= require uikit/addons/timepicker
-//= require uikit/addons/upload
+//= require 'uikit/components/autocomplete'
+//= require 'uikit/components/cover'
+//= require 'uikit/components/datepicker'
+//= require 'uikit/components/form-password'
+//= require 'uikit/components/form-select'
+//= require 'uikit/components/htmleditor'
+//= require 'uikit/components/nestable'
+//= require 'uikit/components/notify'
+//= require 'uikit/components/pagination'
+//= require 'uikit/components/search'
+//= require 'uikit/components/sortable'
+//= require 'uikit/components/sticky'
+//= require 'uikit/components/timepicker'
+//= require 'uikit/components/upload'

data/vendor/assets/javascripts/uikit/{addons → components}/autocomplete.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 (function(addon) {
 
     var component;
@@ -16,6 +15,8 @@
 
 })(function($, UI){
 
+    var active;
+
     UI.component('autocomplete', {
 
         defaults: {
@@ -96,10 +97,7 @@
                     }
 
                 },
-                "keyup": trigger,
-                "blur": function(e) {
-                    setTimeout(function() { $this.hide(); }, 200);
-                }
+                "keyup": trigger
             });
 
             this.dropdown.on("click", ".uk-autocomplete-results > *", function(){
@@ -177,7 +175,7 @@
 
             var data = this.selected.data();
 
-            this.trigger("autocomplete-select", [data, this]);
+            this.trigger("uk.autocomplete.select", [data, this]);
 
             if (data.value) {
                 this.input.val(data.value);
@@ -190,6 +188,8 @@
             if (this.visible) return;
             this.visible = true;
             this.element.addClass("uk-open");
+
+            active = this;
             return this;
         },
 
@@ -197,6 +197,11 @@
             if (!this.visible) return;
             this.visible = false;
             this.element.removeClass("uk-open");
+
+            if (active === this) {
+                active = false;
+            }
+
             return this;
         },
 
@@ -285,7 +290,7 @@
                 this.dropdown.append(this.template({"items":data}));
                 this.show();
 
-                this.trigger('autocomplete-show');
+                this.trigger('uk.autocomplete.show');
             }
 
             return this;
@@ -293,7 +298,7 @@
     });
 
     // init code
-    UI.$doc.on("focus.autocomplete.uikit", "[data-uk-autocomplete]", function(e) {
+    UI.$html.on("focus.autocomplete.uikit", "[data-uk-autocomplete]", function(e) {
 
         var ele = $(this);
         if (!ele.data("autocomplete")) {
@@ -301,5 +306,10 @@
         }
     });
 
+    // register outer click for autocompletes
+    UI.$html.on("click.autocomplete.uikit", function(e){
+        if (active && e.target!=active.input[0]) active.hide();
+    });
+
     return UI.autocomplete;
 });

data/vendor/assets/javascripts/uikit/{addons → components}/cover.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 (function(addon) {
 
     var component;

data/vendor/assets/javascripts/uikit/{addons → components}/datepicker.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 (function(addon) {
 
     var component;
@@ -297,7 +296,7 @@
 
 
     // init code
-    UI.$doc.on("focus.datepicker.uikit", "[data-uk-datepicker]", function(e) {
+    UI.$html.on("focus.datepicker.uikit", "[data-uk-datepicker]", function(e) {
 
         var ele = $(this);
         if (!ele.data("datepicker")) {
@@ -307,7 +306,7 @@
         }
     });
 
-    UI.$doc.on("click.datepicker.uikit", function(e) {
+    UI.$html.on("click.datepicker.uikit", function(e) {
 
         var target = $(e.target);
 

data/vendor/assets/javascripts/uikit/{addons → components}/form-password.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 (function(addon) {
 
     var component;
@@ -46,7 +45,7 @@
     });
 
     // init code
-    UI.$doc.on("click.formpassword.uikit", "[data-uk-form-password]", function(e) {
+    UI.$html.on("click.formpassword.uikit", "[data-uk-form-password]", function(e) {
 
         var ele = $(this);
         if (!ele.data("formPassword")) {

data/vendor/assets/javascripts/uikit/{addons → components}/form-select.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 (function(addon) {
 
     var component;

data/vendor/assets/javascripts/uikit/{addons → components}/htmleditor.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 (function(addon) {
 
     var component;
@@ -145,7 +144,7 @@
                 $this.redraw();
             });
 
-            this.element.attr('data-uk-check-display', 1).on('uk-check-display', function(e) {
+            this.element.attr('data-uk-check-display', 1).on('uk.check.display', function(e) {
                 if(this.htmleditor.is(":visible")) this.fit();
             }.bind(this));
 

data/vendor/assets/javascripts/uikit/{addons → components}/nestable.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 /*
  * Based on Nestable jQuery Plugin - Copyright (c) 2012 David Bushell - http://dbushell.com/
  */
@@ -22,7 +21,8 @@
     var hasTouch     = 'ontouchstart' in window,
         html         = $("html"),
         touchedlists = [],
-        $win         = UI.$win;
+        $win         = UI.$win,
+        draggingElement;
 
     /**
      * Detect CSS pointer-events property
@@ -145,14 +145,14 @@
                 }
                 e.preventDefault();
                 $this.dragStart(hasTouch ? e.touches[0] : e);
-                $this.trigger('nestable-start', [$this]);
+                $this.trigger('uk.nestable.start', [$this]);
             };
 
             var onMoveEvent = function(e) {
                 if ($this.dragEl) {
                     e.preventDefault();
                     $this.dragMove(hasTouch ? e.touches[0] : e);
-                    $this.trigger('nestable-move', [$this]);
+                    $this.trigger('uk.nestable.move', [$this]);
                 }
             };
 
@@ -160,8 +160,10 @@
                 if ($this.dragEl) {
                     e.preventDefault();
                     $this.dragStop(hasTouch ? e.touches[0] : e);
-                    $this.trigger('nestable-stop', [$this]);
+                    $this.trigger('uk.nestable.stop', [$this]);
                 }
+
+                draggingElement = false;
             };
 
             if (hasTouch) {
@@ -329,6 +331,8 @@
             this.dragEl = $(document.createElement(this.options.listNodeName)).addClass(this.options.listClass + ' ' + this.options.dragClass);
             this.dragEl.css('width', dragItem.width());
 
+            draggingElement = this.dragEl;
+
             this.tmpDragOnSiblings = [dragItem[0].previousSibling, dragItem[0].nextSibling];
 
             // fix for zepto.js
@@ -368,10 +372,10 @@
 
             if (this.tmpDragOnSiblings[0]!=el[0].previousSibling || this.tmpDragOnSiblings[0]!=el[0].previousSibling) {
 
-                this.element.trigger('nestable-change',[el, this.hasNewRoot ? "added":"moved"]);
+                this.element.trigger('uk.nestable.change',[el, this.hasNewRoot ? "added":"moved"]);
 
                 if (this.hasNewRoot) {
-                    this.dragRootEl.trigger('nestable-change', [el, "removed"]);
+                    this.dragRootEl.trigger('uk.nestable.change', [el, "removed"]);
                 }
             }
 
@@ -558,6 +562,22 @@
 
     });
 
+    // adjust document scrolling
+    $('html').on('mousemove touchmove', function(e) {
+
+        if (draggingElement) {
+
+
+            var top = draggingElement.offset().top;
+
+            if (top < UI.$win.scrollTop()) {
+                UI.$win.scrollTop(UI.$win.scrollTop() - Math.ceil(draggingElement.height()/2));
+            } else if ( (top + draggingElement.height()) > (window.innerHeight + UI.$win.scrollTop()) ) {
+                UI.$win.scrollTop(UI.$win.scrollTop() + Math.ceil(draggingElement.height()/2));
+            }
+        }
+    });
+
     // init code
     UI.ready(function(context) {
 

data/vendor/assets/javascripts/uikit/{addons → components}/notify.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 (function(addon) {
 
     var component;

data/vendor/assets/javascripts/uikit/{addons → components}/pagination.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 /*
  * Based on simplePagination - Copyright (c) 2012 Flavius Matis - http://flaviusmatis.github.com/simplePagination.js/ (MIT)
  */
@@ -69,7 +68,7 @@
             this.render(pages);
 
             this.options.onSelectPage.apply(this, [pageIndex]);
-            this.trigger('uk-select-page', [pageIndex, this]);
+            this.trigger('uk.pagination.select', [pageIndex, this]);
         },
 
         _render: function() {

data/vendor/assets/javascripts/uikit/{addons → components}/search.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 (function(addon) {
 
     var component;
@@ -67,11 +66,11 @@
                 $this.element.removeClass("uk-active");
             });
 
-            this.on('autocomplete-select', function(e, data) {
+            this.on('uk.autocomplete.select', function(e, data) {
                 if (data.url) {
                   location.href = data.url;
                 } else if(data.moreresults) {
-                  this.autocomplete.input.closest('form').submit();
+                  $this.autocomplete.input.closest('form').submit();
                 }
             });
 
@@ -80,7 +79,7 @@
     });
 
     // init code
-    UI.$doc.on("focus.search.uikit", "[data-uk-search]", function(e) {
+    UI.$html.on("focus.search.uikit", "[data-uk-search]", function(e) {
         var ele = $(this);
 
         if (!ele.data("search")) {

data/vendor/assets/javascripts/uikit/{addons → components}/sortable.js

@@ -1,5 +1,4 @@
-/*! UIkit 2.10.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-
+/*! UIkit 2.11.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 /*
   * Based on nativesortable - Copyright (c) Brian Grinstead - https://github.com/bgrins/nativesortable
   */
@@ -140,7 +139,7 @@
                         addFakeDragHandlers();
 
                         $this.options.start(this, currentlyDraggingElement);
-                        $this.trigger('sortable-start', [$this, currentlyDraggingElement]);
+                        $this.trigger('uk.sortable.start', [$this, currentlyDraggingElement]);
 
                         delayIdle = false;
                     }
@@ -214,18 +213,21 @@
                     }
                 }
 
-                if (!dragging) {
+                if (!dragging && !$this.options.warp) {
                     return;
                 }
 
                 if ($this.options.warp) {
+
                     var thisSibling = currentlyDraggingElement.nextSibling;
                     this.parentNode.insertBefore(currentlyDraggingElement, this);
                     this.parentNode.insertBefore(this, thisSibling);
+
+                    UI.Utils.checkDisplay($this.element.parent());
                 }
 
                 $this.options.change(this, currentlyDraggingElement);
-                $this.trigger('sortable-change', [$this, currentlyDraggingElement]);
+                $this.trigger('uk.sortable.change', [$this, currentlyDraggingElement]);
             });
 
             var handleDragEnd = function(e) {
@@ -245,7 +247,7 @@
                 removeFakeDragHandlers();
 
                 $this.options.stop(this);
-                $this.trigger('sortable-stop', [$this]);
+                $this.trigger('uk.sortable.stop', [$this]);
 
                 draggingPlaceholder.remove();
                 draggingPlaceholder = null;
@@ -259,7 +261,7 @@
                     return true;
                 }
 
-                children.removeClass($this.options.overClass);
+                $this.element.children().removeClass($this.options.overClass);
                 currentlyDraggingTarget = this;
 
                 if (!$this.options.warp) {
@@ -365,9 +367,9 @@
                 children = list.children(),
                 count    = children.length;
 
-            if($this.options.warp || !$this.options.animation) {
+            if ($this.options.warp || !$this.options.animation) {
                 elementToMoveNextTo.parentNode.insertBefore(element, next);
-                UI.Utils.checkDisplay($this.element);
+                UI.Utils.checkDisplay($this.element.parent());
                 return;
             }
 
@@ -384,6 +386,8 @@
 
             elementToMoveNextTo.parentNode.insertBefore(element, next);
 
+            UI.Utils.checkDisplay($this.element.parent());
+
             children = list.children().each(function() {
                 var ele    = $(this);
                 ele.data('offset-after', ele.position());
@@ -407,13 +411,11 @@
                             count--
                             if (!count) {
                                 list.css('min-height', '');
-                                UI.Utils.checkDisplay(ele);
+                                UI.Utils.checkDisplay($this.element.parent());
                             }
                         });
                     }, 0);
             });
-
-
         }
     });
 
@@ -479,10 +481,13 @@
         });
     });
 
-    UI.$doc.on('mousemove touchmove', function(e) {
+    $('html').on('mousemove touchmove', function(e) {
 
         if (delayIdle) {
-            if (Math.abs(e.pageX - delayIdle.pos.x) > delayIdle.threshold || Math.abs(e.pageY - delayIdle.pos.y) > delayIdle.threshold) {
+
+            var src = e.originalEvent.targetTouches ? e.originalEvent.targetTouches[0] : e;
+
+            if (Math.abs(src.pageX - delayIdle.pos.x) > delayIdle.threshold || Math.abs(src.pageY - delayIdle.pos.y) > delayIdle.threshold) {
                 delayIdle.apply();
             }
         }
@@ -504,10 +509,16 @@
                 top    = parseInt(e.originalEvent.pageY, 10) + offset.top;
 
             draggingPlaceholder.css({'left': left, 'top': top });
+
+            if (top < UI.$win.scrollTop()) {
+                UI.$win.scrollTop(UI.$win.scrollTop() - Math.ceil(draggingPlaceholder.height()/2));
+            } else if ( (top + draggingPlaceholder.height()) > (window.innerHeight + UI.$win.scrollTop()) ) {
+                UI.$win.scrollTop(UI.$win.scrollTop() + Math.ceil(draggingPlaceholder.height()/2));
+            }
         }
     });
 
-    UI.$doc.on('mouseup touchend', function() {
+    UI.$html.on('mouseup touchend', function() {
 
         if(!moving && clickedlink) {
             location.href = clickedlink.attr('href');