flashgrid 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8cc0e11e1eb89c76208665fd896be7cc82032b
-  data.tar.gz: cc89cd92bad7caca4b9eb50ca6f7a4e2af48023c
+  metadata.gz: cd3ec69037f078c806099265f08b726c4766efeb
+  data.tar.gz: d9e3590033a4b4f4e909c575ac9eb05a9cfcb96a
 SHA512:
-  metadata.gz: b60e3d9aa04bbfc9bd068c01cdfe7b965f26beed1ebf2ca580ed5cdd6bd2aa9fbfea9bb8d53600580c793aa4347fbf04d831ba2187bf7fc8b373e669d5078c34
-  data.tar.gz: c8c4edecebed1ef77c12ccac615bd9db936e7896ff469e6883184a1c5dd57f99fbb2f848a9a4f15a0f53512abf1ee37ab1983a18865c2e4c7501c81722de911c
+  metadata.gz: 4fb17d8e10229a9516035e230c321a9b59a5a4c45dc2ff332f1c7fe848ed500a921ae5ecd5a4b71464ef5ea9cc30707a7f46d1d3cba6f260ef4af948b70fbbb0
+  data.tar.gz: 90e019644e24b3f892068fed043f9f78b7e6e30448c4a21b716b8c1243be7f7caf69c370c5a28006b1d9c578def9ebc34ff8cfd99a0819b15ad583f4d7f6fa97

data/lib/flashgrid/version.rb

@@ -1,3 +1,3 @@
 module Flashgrid
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/vendor/assets/javascripts/carousel.js

@@ -5,7 +5,7 @@
   // =========================
 
   var Carousel = function (element, options) {
-    this.$element    = $(element).on('keydown.bs.carousel', $.proxy(this.keydown, this))
+    this.$element    = $(element)
     this.$indicators = this.$element.find('.carousel-indicators')
     this.options     = options
     this.paused      =
@@ -14,7 +14,9 @@
     this.$active     =
     this.$items      = null
 
-    this.options.pause == 'hover' && this.$element
+    this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
+
+    this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
       .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
       .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }
@@ -26,7 +28,8 @@
   Carousel.DEFAULTS = {
     interval: 5000,
     pause: 'hover',
-    wrap: true
+    wrap: true,
+    keyboard: true
   }
 
   Carousel.prototype.keydown = function (e) {

data/vendor/assets/javascripts/dropdown.js

@@ -46,7 +46,7 @@
   }
 
   Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27)/.test(e.keyCode)) return
+    if (!/(38|40|27|32)/.test(e.which)) return
 
     var $this = $(this)
 
@@ -58,7 +58,7 @@
     var $parent  = getParent($this)
     var isActive = $parent.hasClass('open')
 
-    if (!isActive || (isActive && e.keyCode == 27)) {
+    if ((!isActive && e.which != 27) || (isActive && e.which == 27)) {
       if (e.which == 27) $parent.find(toggle).trigger('focus')
       return $this.trigger('click')
     }
@@ -70,8 +70,8 @@
 
     var index = $items.index($items.filter(':focus'))
 
-    if (e.keyCode == 38 && index > 0)                 index--                        // up
-    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+    if (e.which == 38 && index > 0)                 index--                        // up
+    if (e.which == 40 && index < $items.length - 1) index++                        // down
     if (!~index)                                      index = 0
 
     $items.eq(index).trigger('focus')

data/vendor/assets/javascripts/file_input.js

@@ -1,94 +1,69 @@
 $(function() {
 
   $("input[type=file].file-input").each(function(i,el){
-
-    // Maybe some fields don't need to be standardized.
     if (typeof $(this).attr("data-vendor-style") != 'undefined') {
       return;
-    }
+    };
 
-    // Set the word to be displayed on the button
     var buttonWord = "Browse";
     if (typeof $(this).attr("title") != "undefined") {
       buttonWord = $(this).attr("title");
-    }
+    };
 
     var input = $("<div>").append( $(el).eq(0).clone() ).html();
 
-    // Set class used to style the input
     var view = "btn";
     if (typeof $(this).attr("data-view") != "undefined") {
       view = $(this).attr("data-view");
-    }
+    };
 
     $(el).replaceWith("<a class='"+view+" file-input'>"+buttonWord+input+"</a>");
 
-    // Set class when input has changed change
     var viewChanged = null;
     if (typeof $(this).attr("data-view-changed") != "undefined") {
       viewChanged = $(this).attr("data-view-changed");
-    }
+    };
 
-    // Updated button on change to show add a class which can show an indicator
     $(".file-input input[type=file]").change(function(){
       $("a.file-input").addClass(viewChanged);
     });
-  })
-
-  // After we have found all of the file inputs let's apply a listener for tracking the mouse movement.
-  // This is important because the in order to give the illusion that this is a button in FF we actually need to move the button from the file input under the cursor. Ugh.
-  .promise().done( function(){
-
-    // As the cursor moves over our new Bootstrap button we need to adjust the position of the invisible file input Browse button to be under the cursor.
-    // This gives us the pointer cursor that FF denies us
-    $(".file-input").mousemove(function(cursor) {
-
-      var input, wrapper, wrapperX, wrapperY, inputWidth, inputHeight, cursorX, cursorY;
-
-      // This wrapper elent (the button surround this file input)
-      wrapper = $(this);
 
-      // The invisible file input elent
-      input = wrapper.find("input");
+    var cssHtml = "<style>"+
+    ".file-input { overflow: hidden; position: relative; cursor: pointer; z-index: 1; }"+
+    ".file-input input[type=file], .btn-file input[type=file]:focus, .btn-file input[type=file]:hover { position: absolute; top: 0; left: 0; cursor: pointer; opacity: 0; z-index: 99; outline: 0; }"+
+    "</style>";
 
-      // The left-most position of the wrapper
-      wrapperX = wrapper.offset().left;
+    $("link[rel=stylesheet]").eq(0).before(cssHtml);
 
-      // The top-most position of the wrapper
-      wrapperY = wrapper.offset().top;
+  }).promise().done( function(){
 
-      // The with of the browsers input field
-      inputWidth= input.width();
-
-      // The height of the browsers input field
-      inputHeight= input.height();
-
-      //The position of the cursor in the wrapper
-      cursorX = cursor.pageX;
-      cursorY = cursor.pageY;
-
-      //The positions we are to move the invisible file input
-      // The 20 at the end is an arbitrary number of pixels that we can shift the input such that cursor is not pointing at the end of the Browse button but somewhere nearer the middle
-      moveInputX = cursorX - wrapperX - inputWidth + 20;
+    $(".file-input").mousemove(function(cursor) {
+      var input, wrapper, wrapperX, wrapperY, inputWidth, inputHeight, cursorX, cursorY;
 
-      // Slides the invisible input Browse button to be positioned middle under the cursor
-      moveInputY = cursorY- wrapperY - (inputHeight/2);
+      wrapper     = $(this);
+      input       = wrapper.find("input");
+      wrapperX    = wrapper.offset().left;
+      wrapperY    = wrapper.offset().top;
+      inputWidth  = input.width();
+      inputHeight = input.height();
+      cursorX     = cursor.pageX;
+      cursorY     = cursor.pageY;
+      moveInputX  = cursorX - wrapperX - inputWidth + 20;
+      moveInputY  = cursorY- wrapperY - (inputHeight/2);
 
-      // Apply the positioning styles to actually move the invisible file input
       input.css({
         left:moveInputX,
         top:moveInputY
       });
     });
-});
+  });
 
-// Add the styles before the first stylesheet
-// This ensures they can be easily overridden with developer styles
-var cssHtml = "<style>"+
-  ".file-input { overflow: hidden; position: relative; cursor: pointer; z-index: 1; }"+
-  ".file-input input[type=file], .btn-file input[type=file]:focus, .btn-file input[type=file]:hover { position: absolute; top: 0; left: 0; cursor: pointer; opacity: 0; z-index: 99; outline: 0; }"+
-  "</style>";
+});
 
-  $("link[rel=stylesheet]").eq(0).before(cssHtml);
+function formFileGroup() { "use strict";
+  $('.form-file-input').click();
 
-});
+  $('.form-file-input').change(function(){
+    $('.form-file-text').val($('.form-file-input').val());
+  });
+};

data/vendor/assets/javascripts/map.js

@@ -497,7 +497,12 @@ GMaps.prototype.createControl = function(options) {
   }
 
   if (options.content) {
-    control.innerHTML = options.content;
+    if (typeof options.content === 'string') {
+      control.innerHTML = options.content;
+    }
+    else if (options.content instanceof HTMLElement) {
+      control.appendChild(options.content);
+    }
   }
 
   if (options.position) {
@@ -788,6 +793,7 @@ GMaps.prototype.drawOverlay = function(options) {
     }
 
     if (options.click) {
+      panes.overlayMouseTarget.appendChild(overlay.el);
       google.maps.event.addDomListener(overlay.el, 'click', function() {
         options.click.apply(overlay, [overlay]);
       });
@@ -2051,6 +2057,17 @@ if (!google.maps.Polygon.prototype.containsLatLng) {
   };
 }
 
+if (!google.maps.Circle.prototype.containsLatLng) {
+  google.maps.Circle.prototype.containsLatLng = function(latLng) {
+    if (google.maps.geometry) {
+      return google.maps.geometry.spherical.computeDistanceBetween(this.getCenter(), latLng) <= this.getRadius();
+    }
+    else {
+      return true;
+    }
+  };
+}
+
 google.maps.LatLngBounds.prototype.containsLatLng = function(latLng) {
   return this.contains(latLng);
 };

data/vendor/assets/javascripts/modal.js

@@ -157,14 +157,13 @@
       var doAnimate = $.support.transition && animate
 
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-        .appendTo(this.$body)
-
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
-        if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
-          ? this.$element[0].focus.call(this.$element[0])
-          : this.hide.call(this)
-      }, this))
+        .prependTo(this.$element)
+        .on('click.dismiss.bs.modal', $.proxy(function (e) {
+          if (e.target !== e.currentTarget) return
+          this.options.backdrop == 'static'
+            ? this.$element[0].focus.call(this.$element[0])
+            : this.hide.call(this)
+        }, this))
 
       if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
 

data/vendor/assets/stylesheets/button.css.scss

@@ -225,26 +225,31 @@ input.btn-block {
 .btn-icon {
   font-size: 17px;
   line-height: 17px;
+  min-width: 42px;
   padding: 10px 13px;
 }
 .btn-large.btn-icon {
   font-size: 23px;
   line-height: 22px;
+  min-width: 50px;
   padding: 11px 13px;
 }
 .btn-medium.btn-icon {
   font-size: 15px;
   line-height: 15px;
+  min-width: 34px;
   padding: 7px 10px 8px 10px;
 }
 .btn-small.btn-icon {
   font-size: 14px;
   line-height: 14px;
-  padding: 6px 7px 6px 6px;
+  min-width: 28px;
+  padding: 6px 7px;
 }
 .btn-mini.btn-icon {
   font-size: 11px;
   line-height: 11px;
+  min-width: 25px;
   padding: 5px 6px;
 }
 
@@ -311,10 +316,6 @@ input.btn-block {
   border-color: rgba(252,146,35,1);
   color: rgba(252,146,35,1);
 }
-
-
-
-
 .btn-outline.btn-purple {
   border-color: rgba(117,73,170,1);
   color: rgba(117,73,170,1);
@@ -326,10 +327,6 @@ input.btn-block {
   border-color: rgba(137,93,190,1);
   color: rgba(137,93,190,1);
 }
-
-
-
-
 .btn-outline.btn-red {
   border-color: rgba(218,79,46,1);
   color: rgba(218,79,46,1);

data/vendor/assets/stylesheets/form.css.scss

@@ -207,19 +207,32 @@ select.form-input-initial-width {
 .form-error-messages li:last-child  { padding-bottom: 10px; }
 .form-textarea-small { height: 80px; }
 .form-textarea-large { height: 200px; }
-.form-input-group {
+.form-file-input {
+  height: 0;
+  margin: 0;
+  padding: 0;
+  position: fixed;
+  visibility: hidden;
+  width: 0;
+}
+.form-input-group,
+.form-file-group {
   border-collapse: separate;
   display: table;
   margin-bottom: 5px;
   position: relative;
 }
-.form-input-group[class*="col-"] {
+.form-input-group[class*="col-"],
+.form-file-group[class*="col-"] {
   float: none;
   padding: 0;
 }
 .form-input-group input,
-.form-input-group-addon { display: table-cell; }
-.form-input-group input { margin: 0; }
+.form-input-group-addon,
+.form-file-group input,
+.form-file-group-addon { display: table-cell; }
+.form-input-group input,
+.form-file-group input { margin: 0; }
 .form-input-group-addon {
   background: rgba(245,248,250,1);
   border: 1px solid rgba(225,232,237,1);
@@ -234,8 +247,34 @@ select.form-input-initial-width {
   white-space: nowrap;
   vertical-align: middle;
 }
-.form-input-group-addon:first-child { border-right: 0; }
-.form-input-group-addon:last-child  { border-left: 0; }
+.form-file-group-addon {
+  -moz-box-sizing: border-box;
+       box-sizing: border-box;
+  line-height: 0;
+  padding: 0;
+  text-align: center;
+  width: 1%;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+.form-file-group-button {
+  padding-bottom: 12px;
+     padding-top: 12px;
+}
+.form-file-group-addon:first-child .form-file-group-button {
+  border-bottom-right-radius: 0;
+     border-top-right-radius: 0;
+}
+.form-file-group-addon:last-child .form-file-group-button  {
+  border-bottom-left-radius: 0;
+     border-top-left-radius: 0;
+}
+.form-input-group-addon:first-child,
+.form-file-group-addon:first-child,
+.form-file-group-addon:first-child .form-file-group-button { border-right: 0; }
+.form-input-group-addon:last-child,
+.form-file-group-addon:last-child,
+.form-file-group-addon:last-child .form-file-group-button  { border-left: 0; }
 .form-input-group-addon input[type="radio"],
 .form-input-group-addon input[type="checkbox"] { margin: 0; }
 .form-input-inline {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flashgrid
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Flashgrid Responsive Web Framework