foundation-rails 5.5.1.0 → 5.5.1.1

data/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "foundation-rails",
-  "version": "5.5.0.0",
+  "version": "5.5.1.1",
   "dependencies": {
-    "foundation": "5.5.0"
+    "foundation": "5.5.1"
   }
 }

data/lib/foundation/rails/version.rb

@@ -1,5 +1,5 @@
 module Foundation
   module Rails
-    VERSION = "5.5.1.0"
+    VERSION = "5.5.1.1"
   end
 end

data/update-gem.sh

@@ -1,13 +1,18 @@
 #! /bin/sh
 
+# clean old version
+rm -rf vendor
+mkdir -p vendor/assets/javascripts/vendor vendor/assets/stylesheets
+
+# update assets
 bower install
-rm -rf vendor/assets/javascripts/vendor
-rm -rf vendor/assets/stylesheets
-mkdir -p vendor/assets/javascripts/vendor
-mkdir -p vendor/assets/stylesheets
 cp bower_components/modernizr/modernizr.js vendor/assets/javascripts/vendor/.
 cp -R bower_components/foundation/js/foundation/ vendor/assets/javascripts/foundation/
-cp -R bower_components/foundation/scss/ vendor/assets/stylesheets/
-cp bower_components/foundation/scss/foundation/_settings.scss vendor/assets/.
+cp -R bower_components/foundation/scss/* vendor/assets/stylesheets/
+
+# create vendor/assets/javascripts/foundation.js (rails inclusions //=require foundation, ...)
+cd vendor/assets/javascripts
+for f in foundation/*.js; do echo "//= require $f" | sed 's/.js//' >> foundation.js ; done
+
+# echo "Now update version.rb"
 
-# echo "Now update version.rb"

data/vendor/assets/javascripts/foundation.js

@@ -1,11 +1,12 @@
-//= require foundation/foundation
 //= require foundation/foundation.abide
 //= require foundation/foundation.accordion
 //= require foundation/foundation.alert
 //= require foundation/foundation.clearing
 //= require foundation/foundation.dropdown
+//= require foundation/foundation.equalizer
 //= require foundation/foundation.interchange
 //= require foundation/foundation.joyride
+//= require foundation/foundation
 //= require foundation/foundation.magellan
 //= require foundation/foundation.offcanvas
 //= require foundation/foundation.orbit
@@ -14,4 +15,3 @@
 //= require foundation/foundation.tab
 //= require foundation/foundation.tooltip
 //= require foundation/foundation.topbar
-//= require foundation/foundation.equalizer

data/vendor/assets/javascripts/foundation/foundation.abide.js

@@ -4,20 +4,20 @@
   Foundation.libs.abide = {
     name : 'abide',
 
-    version : '5.5.0',
+    version : '5.5.1',
 
     settings : {
       live_validate : true,
-      validate_on_blur: true,
+      validate_on_blur : true,
       focus_on_invalid : true,
-      error_labels: true, // labels with a for="inputId" will recieve an `error` class
-      error_class: 'error',
+      error_labels : true, // labels with a for="inputId" will recieve an `error` class
+      error_class : 'error',
       timeout : 1000,
       patterns : {
-        alpha: /^[a-zA-Z]+$/,
+        alpha : /^[a-zA-Z]+$/,
         alpha_numeric : /^[a-zA-Z0-9]+$/,
-        integer: /^[-+]?\d+$/,
-        number: /^[-+]?\d*(?:[\.\,]\d+)?$/,
+        integer : /^[-+]?\d+$/,
+        number : /^[-+]?\d*(?:[\.\,]\d+)?$/,
 
         // amex, visa, diners
         card : /^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\d{3})\d{11})$/,
@@ -26,26 +26,26 @@
         // http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#valid-e-mail-address
         email : /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/,
 
-        url: /^(https?|ftp|file|ssh):\/\/(((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/,
+        url : /^(https?|ftp|file|ssh):\/\/(((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/,
         // abc.de
-        domain: /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,8}$/,
+        domain : /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,8}$/,
 
-        datetime: /^([0-2][0-9]{3})\-([0-1][0-9])\-([0-3][0-9])T([0-5][0-9])\:([0-5][0-9])\:([0-5][0-9])(Z|([\-\+]([0-1][0-9])\:00))$/,
+        datetime : /^([0-2][0-9]{3})\-([0-1][0-9])\-([0-3][0-9])T([0-5][0-9])\:([0-5][0-9])\:([0-5][0-9])(Z|([\-\+]([0-1][0-9])\:00))$/,
         // YYYY-MM-DD
-        date: /(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))$/,
+        date : /(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))$/,
         // HH:MM:SS
         time : /^(0[0-9]|1[0-9]|2[0-3])(:[0-5][0-9]){2}$/,
-        dateISO: /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/,
+        dateISO : /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/,
         // MM/DD/YYYY
         month_day_year : /^(0[1-9]|1[012])[- \/.](0[1-9]|[12][0-9]|3[01])[- \/.]\d{4}$/,
         // DD/MM/YYYY
         day_month_year : /^(0[1-9]|[12][0-9]|3[01])[- \/.](0[1-9]|1[012])[- \/.]\d{4}$/,
 
         // #FFF or #FFFFFF
-        color: /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/
+        color : /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/
       },
       validators : {
-        equalTo: function(el, required, parent) {
+        equalTo : function (el, required, parent) {
           var from  = document.getElementById(el.getAttribute(this.add_namespace('data-equalto'))).value,
               to    = el.value,
               valid = (from === to);
@@ -74,7 +74,7 @@
           var is_ajax = /ajax/i.test(self.S(this).attr(self.attr_name()));
           return self.validate(self.S(this).find('input, textarea, select').get(), e, is_ajax);
         })
-        .on('reset', function() {
+        .on('reset', function () {
           return self.reset($(this));
         })
         .find('input, textarea, select')
@@ -107,9 +107,11 @@
           submit_event = /submit/.test(e.type);
 
       // Has to count up to make sure the focus gets applied to the top error
-      for (var i=0; i < validation_count; i++) {
+      for (var i = 0; i < validation_count; i++) {
         if (!validations[i] && (submit_event || is_ajax)) {
-          if (this.settings.focus_on_invalid) els[i].focus();
+          if (this.settings.focus_on_invalid) {
+            els[i].focus();
+          }
           form.trigger('invalid').trigger('invalid.fndtn.abide');
           this.S(els[i]).closest('form').attr(this.invalid_attr, '');
           return false;
@@ -122,7 +124,9 @@
 
       form.removeAttr(this.invalid_attr);
 
-      if (is_ajax) return false;
+      if (is_ajax) {
+        return false;
+      }
 
       return true;
     },
@@ -171,8 +175,8 @@
             value = el.value.trim(),
             direct_parent = this.S(el).parent(),
             validator = el.getAttribute(this.add_namespace('data-abide-validator')),
-            is_radio = el.type === "radio",
-            is_checkbox = el.type === "checkbox",
+            is_radio = el.type === 'radio',
+            is_checkbox = el.type === 'checkbox',
             label = this.S('label[for="' + el.getAttribute('id') + '"]'),
             valid_length = (required) ? (el.value.length > 0) : true,
             el_validations = [];
@@ -180,7 +184,7 @@
         var parent, valid;
 
         // support old way to do equalTo validations
-        if(el.getAttribute(this.add_namespace('data-equalto'))) { validator = "equalTo" }
+        if (el.getAttribute(this.add_namespace('data-equalto'))) { validator = 'equalTo' }
 
         if (!direct_parent.is('label')) {
           parent = direct_parent;
@@ -206,9 +210,9 @@
             el_validations.push(false);
           }
 
-          el_validations = [el_validations.every(function(valid){return valid;})];
+          el_validations = [el_validations.every(function (valid) {return valid;})];
 
-          if(el_validations[0]){
+          if (el_validations[0]) {
             this.S(el).removeAttr(this.invalid_attr);
             el.setAttribute('aria-invalid', 'false');
             el.removeAttribute('aria-describedby');
@@ -222,9 +226,11 @@
             el.setAttribute('aria-invalid', 'true');
 
             // Try to find the error associated with the input
-            var errorElem = parent.find('small.'+this.settings.error_class, 'span.'+this.settings.error_class);
-            var errorID = errorElem.length > 0 ? errorElem[0].id : "";
-            if (errorID.length > 0) el.setAttribute('aria-describedby', errorID);
+            var errorElem = parent.find('small.' + this.settings.error_class, 'span.' + this.settings.error_class);
+            var errorID = errorElem.length > 0 ? errorElem[0].id : '';
+            if (errorID.length > 0) {
+              el.setAttribute('aria-describedby', errorID);
+            }
 
             // el.setAttribute('aria-describedby', $(el).find('.error')[0].id);
             parent.addClass(this.settings.error_class);
@@ -236,13 +242,13 @@
         }
         validations.push(el_validations[0]);
       }
-      validations = [validations.every(function(valid){return valid;})];
+      validations = [validations.every(function (valid) {return valid;})];
       return validations;
     },
 
-    valid_checkbox : function(el, required) {
+    valid_checkbox : function (el, required) {
       var el = this.S(el),
-          valid = (el.is(':checked') || !required);
+          valid = (el.is(':checked') || !required || el.get(0).getAttribute('disabled'));
 
       if (valid) {
         el.removeAttr(this.invalid_attr).parent().removeClass(this.settings.error_class);
@@ -255,17 +261,29 @@
 
     valid_radio : function (el, required) {
       var name = el.getAttribute('name'),
-          group = this.S(el).closest('[data-' + this.attr_name(true) + ']').find("[name='"+name+"']"),
+          group = this.S(el).closest('[data-' + this.attr_name(true) + ']').find("[name='" + name + "']"),
           count = group.length,
-          valid = false;
+          valid = false,
+          disabled = false;
 
       // Has to count up to make sure the focus gets applied to the top error
-      for (var i=0; i < count; i++) {
-        if (group[i].checked) valid = true;
-      }
+        for (var i=0; i < count; i++) {
+            if( group[i].getAttribute('disabled') ){
+                disabled=true;
+                valid=true;
+            } else {
+                if (group[i].checked){
+                    valid = true;
+                } else {
+                    if( disabled ){
+                        valid = false;
+                    }
+                }
+            }
+        }
 
       // Has to count up to make sure the focus gets applied to the top error
-      for (var i=0; i < count; i++) {
+      for (var i = 0; i < count; i++) {
         if (valid) {
           this.S(group[i]).removeAttr(this.invalid_attr).parent().removeClass(this.settings.error_class);
         } else {
@@ -276,7 +294,7 @@
       return valid;
     },
 
-    valid_equal: function(el, required, parent) {
+    valid_equal : function (el, required, parent) {
       var from  = document.getElementById(el.getAttribute(this.add_namespace('data-equalto'))).value,
           to    = el.value,
           valid = (from === to);
@@ -284,17 +302,21 @@
       if (valid) {
         this.S(el).removeAttr(this.invalid_attr);
         parent.removeClass(this.settings.error_class);
-        if (label.length > 0 && settings.error_labels) label.removeClass(this.settings.error_class);
+        if (label.length > 0 && settings.error_labels) {
+          label.removeClass(this.settings.error_class);
+        }
       } else {
         this.S(el).attr(this.invalid_attr, '');
         parent.addClass(this.settings.error_class);
-        if (label.length > 0 && settings.error_labels) label.addClass(this.settings.error_class);
+        if (label.length > 0 && settings.error_labels) {
+          label.addClass(this.settings.error_class);
+        }
       }
 
       return valid;
     },
 
-    valid_oneof: function(el, required, parent, doNotValidateOthers) {
+    valid_oneof : function (el, required, parent, doNotValidateOthers) {
       var el = this.S(el),
         others = this.S('[' + this.add_namespace('data-oneof') + ']'),
         valid = others.filter(':checked').length > 0;
@@ -307,7 +329,7 @@
 
       if (!doNotValidateOthers) {
         var _this = this;
-        others.each(function() {
+        others.each(function () {
           _this.valid_oneof.call(_this, this, null, null, true);
         });
       }

data/vendor/assets/javascripts/foundation/foundation.accordion.js

@@ -4,13 +4,13 @@
   Foundation.libs.accordion = {
     name : 'accordion',
 
-    version : '5.5.0',
+    version : '5.5.1',
 
     settings : {
-      content_class: 'content',
-      active_class: 'active',
-      multi_expand: false,
-      toggleable: true,
+      content_class : 'content',
+      active_class : 'active',
+      multi_expand : false,
+      toggleable : true,
       callback : function () {}
     },
 
@@ -29,13 +29,13 @@
             settings = accordion.data(self.attr_name(true) + '-init') || self.settings,
             target = S('#' + this.href.split('#')[1]),
             aunts = $('> .accordion-navigation', accordion),
-            siblings = aunts.children('.'+settings.content_class),
+            siblings = aunts.children('.' + settings.content_class),
             active_content = siblings.filter('.' + settings.active_class);
 
         e.preventDefault();
 
         if (accordion.attr(self.attr_name())) {
-          siblings = siblings.add('[' + groupSelector + '] dd > '+'.'+settings.content_class);
+          siblings = siblings.add('[' + groupSelector + '] dd > ' + '.' + settings.content_class);
           aunts = aunts.add('[' + groupSelector + '] .accordion-navigation');
         }
 

data/vendor/assets/javascripts/foundation/foundation.alert.js

@@ -4,10 +4,10 @@
   Foundation.libs.alert = {
     name : 'alert',
 
-    version : '5.5.0',
+    version : '5.5.1',
 
     settings : {
-      callback: function (){}
+      callback : function () {}
     },
 
     init : function (scope, method, options) {
@@ -25,7 +25,7 @@
         e.preventDefault();
         if (Modernizr.csstransitions) {
           alertBox.addClass('alert-close');
-          alertBox.on('transitionend webkitTransitionEnd oTransitionEnd', function(e) {
+          alertBox.on('transitionend webkitTransitionEnd oTransitionEnd', function (e) {
             S(this).trigger('close').trigger('close.fndtn.alert').remove();
             settings.callback();
           });

data/vendor/assets/javascripts/foundation/foundation.clearing.js

@@ -4,7 +4,7 @@
   Foundation.libs.clearing = {
     name : 'clearing',
 
-    version: '5.5.0',
+    version : '5.5.1',
 
     settings : {
       templates : {
@@ -16,7 +16,7 @@
 
       // comma delimited list of selectors that, on click, will close clearing,
       // add 'div.clearing-blackout, div.visible-img' to close on background click
-      close_selectors : '.clearing-close, div.clearing-blackout', 
+      close_selectors : '.clearing-close, div.clearing-blackout',
 
       // Default to the entire li element.
       open_selectors : '',
@@ -107,23 +107,27 @@
       S = self.S;
 
       S(this.scope)
-        .on('touchstart.fndtn.clearing', '.visible-img', function(e) {
+        .on('touchstart.fndtn.clearing', '.visible-img', function (e) {
           if (!e.touches) { e = e.originalEvent; }
           var data = {
-                start_page_x: e.touches[0].pageX,
-                start_page_y: e.touches[0].pageY,
-                start_time: (new Date()).getTime(),
-                delta_x: 0,
-                is_scrolling: undefined
+                start_page_x : e.touches[0].pageX,
+                start_page_y : e.touches[0].pageY,
+                start_time : (new Date()).getTime(),
+                delta_x : 0,
+                is_scrolling : undefined
               };
 
           S(this).data('swipe-transition', data);
           e.stopPropagation();
         })
-        .on('touchmove.fndtn.clearing', '.visible-img', function(e) {
-          if (!e.touches) { e = e.originalEvent; }
+        .on('touchmove.fndtn.clearing', '.visible-img', function (e) {
+          if (!e.touches) {
+            e = e.originalEvent;
+          }
           // Ignore pinch/zoom events
-          if(e.touches.length > 1 || e.scale && e.scale !== 1) return;
+          if (e.touches.length > 1 || e.scale && e.scale !== 1) {
+            return;
+          }
 
           var data = S(this).data('swipe-transition');
 
@@ -148,7 +152,7 @@
             self.nav(e, direction);
           }
         })
-        .on('touchend.fndtn.clearing', '.visible-img', function(e) {
+        .on('touchend.fndtn.clearing', '.visible-img', function (e) {
           S(this).data('swipe-transition', {});
           e.stopPropagation();
         });
@@ -160,7 +164,7 @@
       if ($el.parent().hasClass('carousel')) {
         return;
       }
-      
+
       $el.after('<div id="foundationClearingHolder"></div>');
 
       var grid = $el.detach(),
@@ -171,12 +175,12 @@
       } else {
         grid_outerHTML = grid[0].outerHTML;
       }
-      
+
       var holder = this.S('#foundationClearingHolder'),
           settings = $el.data(this.attr_name(true) + '-init'),
           data = {
-            grid: '<div class="carousel">' + grid_outerHTML + '</div>',
-            viewing: settings.templates.viewing
+            grid : '<div class="carousel">' + grid_outerHTML + '</div>',
+            viewing : settings.templates.viewing
           },
           wrapper = '<div class="clearing-assembled"><div>' + data.viewing +
             data.grid + '</div></div>',
@@ -200,7 +204,7 @@
           error = false;
 
       // Event to disable scrolling on touch devices when Clearing is activated
-      $('body').on('touchmove',function(e){
+      $('body').on('touchmove', function (e) {
         e.preventDefault();
       });
 
@@ -272,7 +276,7 @@
           .removeClass('clearing-blackout');
         container.removeClass('clearing-container');
         visible_image.hide();
-        visible_image.trigger('closed.fndtn.clearing');        
+        visible_image.trigger('closed.fndtn.clearing');
       }
 
       // Event to re-enable scrolling on touch devices
@@ -291,9 +295,15 @@
           PREV_KEY = this.rtl ? 39 : 37,
           ESC_KEY = 27;
 
-      if (e.which === NEXT_KEY) this.go(clearing, 'next');
-      if (e.which === PREV_KEY) this.go(clearing, 'prev');
-      if (e.which === ESC_KEY) this.S('a.clearing-close').trigger('click').trigger('click.fndtn.clearing');
+      if (e.which === NEXT_KEY) {
+        this.go(clearing, 'next');
+      }
+      if (e.which === PREV_KEY) {
+        this.go(clearing, 'prev');
+      }
+      if (e.which === ESC_KEY) {
+        this.S('a.clearing-close').trigger('click').trigger('click.fndtn.clearing');
+      }
     },
 
     nav : function (e, direction) {
@@ -352,34 +362,18 @@
     },
 
     center_and_label : function (target, label) {
-      if (!this.rtl) {
-        target.css({
-          marginLeft : -(target.outerWidth() / 2),
-          marginTop : -(target.outerHeight() / 2)
+      if (!this.rtl && label.length > 0) {
+        label.css({
+          marginLeft : -(label.outerWidth() / 2),
+          marginTop : -(target.outerHeight() / 2)-label.outerHeight()-10
         });
-
-        if (label.length > 0) {
-          label.css({
-            marginLeft : -(label.outerWidth() / 2),
-            marginTop : -(target.outerHeight() / 2)-label.outerHeight()-10
-          });
-        }
       } else {
-        target.css({
-          marginRight : -(target.outerWidth() / 2),
-          marginTop : -(target.outerHeight() / 2),
+        label.css({
+          marginRight : -(label.outerWidth() / 2),
+          marginTop : -(target.outerHeight() / 2)-label.outerHeight()-10,
           left: 'auto',
           right: '50%'
         });
-
-        if (label.length > 0) {
-          label.css({
-            marginRight : -(label.outerWidth() / 2),
-            marginTop : -(target.outerHeight() / 2)-label.outerHeight()-10,
-            left: 'auto',
-            right: '50%'
-          });
-        }
       }
       return this;
     },
@@ -397,7 +391,9 @@
 
       this.preload($image);
 
-      if (href) return href;
+      if (href) {
+        return href;
+      }
       return $image.attr('src');
     },
 
@@ -436,7 +432,7 @@
           .hide();
       }
       return this;
-    }, 
+    },
 
     // directional methods
 
@@ -470,7 +466,7 @@
       // we use jQuery animate instead of CSS transitions because we
       // need a callback to unlock the next animation
       // needs support for RTL **
-      if (target.index() !== old_index && !/skip/.test(direction)){
+      if (target.index() !== old_index && !/skip/.test(direction)) {
         if (/left/.test(direction)) {
           this.lock();
           dir_obj[dir] = left + width;
@@ -526,7 +522,9 @@
 
     adjacent : function (current_index, target_index) {
       for (var i = target_index + 1; i >= target_index - 1; i--) {
-        if (i === current_index) return true;
+        if (i === current_index) {
+          return true;
+        }
       }
       return false;
     },