dvl-core 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e54afe4615b869174072aac9aab099f8630013
-  data.tar.gz: 259991f207106b97bfb54b281e6af45255596402
+  metadata.gz: 69cc414680d46fe057a1cb61d4352a180d3b5fe6
+  data.tar.gz: d152e60d2aaa27d56e67feef4e9c569a39946879
 SHA512:
-  metadata.gz: 90f5bc10c21c8ee44fe452f886702d906e68dea4db35f6606e5e76cabf1e681f53669dfcaeb324b7939648dacebd81030c839261218904efb4efeb0a419d3e3f
-  data.tar.gz: 976e55d72e7e841f928629ff6a7e8ce31a31b219e8ecfa6f6ae61c3b91dff6e04e273d7b15843c954e79db3e497466d84daf673353b033557e8e5d6a18ebcb86
+  metadata.gz: b03cc1e663a2e4849d00d9fa9a0660e69d9e4673020429a651ba7bdc4ba3cfa16c62d38e37eb8fbbf6052ff8ccd2d438dfe6e87e536fb1f8feaf1024fe67fa0f
+  data.tar.gz: 0f311398a26ab224a5709d5732ba93f23ae1267024a189d7efb792510ad415ea6e066ddb79560ac7ba145baf857f8c9498fb5c443d2dabafb048e8ff3d9ff325

data/lib/dvl/core/version.rb

@@ -1,5 +1,5 @@
 module Dvl
   module Core
-    VERSION = '0.0.9'
+    VERSION = '0.0.10'
   end
 end

data/vendor/assets/javascripts/dvl/core/buttons.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.3.0
+ * Bootstrap: button.js v3.3.1
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -19,7 +19,7 @@
     this.isLoading = false
   }
 
-  Button.VERSION  = '3.3.0'
+  Button.VERSION  = '3.3.1'
 
   Button.DEFAULTS = {
     loadingText: 'loading...'
@@ -110,7 +110,7 @@
       e.preventDefault()
     })
     .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      $(e.target).closest('.btn').toggleClass('focus', e.type == 'focus')
+      $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
     })
 
 }(jQuery);

data/vendor/assets/javascripts/dvl/core/dropdowns.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.3.0
+ * Bootstrap: dropdown.js v3.3.1
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -19,7 +19,7 @@
     $(element).on('click.bs.dropdown', this.toggle)
   }
 
-  Dropdown.VERSION = '3.3.0'
+  Dropdown.VERSION = '3.3.1'
 
   Dropdown.prototype.toggle = function (e) {
     var $this = $(this)
@@ -55,7 +55,7 @@
   }
 
   Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27|32)/.test(e.which)) return
+    if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
 
     var $this = $(this)
 

data/vendor/assets/javascripts/dvl/core/modals.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.3.0
+ * Bootstrap: modal.js v3.3.1
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -30,7 +30,7 @@
     }
   }
 
-  Modal.VERSION  = '3.3.0'
+  Modal.VERSION  = '3.3.1'
 
   Modal.TRANSITION_DURATION = 300
   Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -56,10 +56,11 @@
     this.isShown = true
 
     this.checkScrollbar()
+    this.setScrollbar()
     this.$body.addClass('modal-open')
 
-    this.setScrollbar()
     this.escape()
+    this.resize()
 
     this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
 
@@ -74,6 +75,9 @@
         .show()
         .scrollTop(0)
 
+      if (that.options.backdrop) that.adjustBackdrop()
+      that.adjustDialog()
+
       if (transition) {
         that.$element[0].offsetWidth // force reflow
       }
@@ -108,6 +112,7 @@
     this.isShown = false
 
     this.escape()
+    this.resize()
 
     $(document).off('focusin.bs.modal')
 
@@ -143,11 +148,20 @@
     }
   }
 
+  Modal.prototype.resize = function () {
+    if (this.isShown) {
+      $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
+    } else {
+      $(window).off('resize.bs.modal')
+    }
+  }
+
   Modal.prototype.hideModal = function () {
     var that = this
     this.$element.hide()
     this.backdrop(function () {
       that.$body.removeClass('modal-open')
+      that.resetAdjustments()
       that.resetScrollbar()
       that.$element.trigger('hidden.bs.modal')
     })
@@ -204,13 +218,43 @@
     }
   }
 
+  // these following methods are used to handle overflowing modals
+
+  Modal.prototype.handleUpdate = function () {
+    if (this.options.backdrop) this.adjustBackdrop()
+    this.adjustDialog()
+  }
+
+  Modal.prototype.adjustBackdrop = function () {
+    this.$backdrop
+      .css('height', 0)
+      .css('height', this.$element[0].scrollHeight)
+  }
+
+  Modal.prototype.adjustDialog = function () {
+    var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
+
+    this.$element.css({
+      paddingLeft:  !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
+      paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
+    })
+  }
+
+  Modal.prototype.resetAdjustments = function () {
+    this.$element.css({
+      paddingLeft: '',
+      paddingRight: ''
+    })
+  }
+
   Modal.prototype.checkScrollbar = function () {
+    this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight
     this.scrollbarWidth = this.measureScrollbar()
   }
 
   Modal.prototype.setScrollbar = function () {
     var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
-    if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
+    if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
   }
 
   Modal.prototype.resetScrollbar = function () {
@@ -218,7 +262,6 @@
   }
 
   Modal.prototype.measureScrollbar = function () { // thx walsh
-    if (document.body.clientWidth >= window.innerWidth) return 0
     var scrollDiv = document.createElement('div')
     scrollDiv.className = 'modal-scrollbar-measure'
     this.$body.append(scrollDiv)

data/vendor/assets/javascripts/dvl/core/tooltips.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.3.0
+ * Bootstrap: tooltip.js v3.3.1
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
@@ -25,7 +25,7 @@
     this.init('tooltip', element, options)
   }
 
-  Tooltip.VERSION  = '3.3.0'
+  Tooltip.VERSION  = '3.3.1'
 
   Tooltip.TRANSITION_DURATION = 150
 

data/vendor/assets/stylesheets/dvl/core/includes.scss

@@ -1,8 +1,5 @@
 // #### VARIABLES ####
 
-// Colors
-$bodyBackgroundColor: #aab2bd;
-
 // Grayscale
 $black: #222;
 $darkestGray: #444;
@@ -33,25 +30,7 @@ $mintHighlight: #e7f9e7;
 $questionTextColor: #297cbb;
 $purpleBlue: #6188f5;
 
-// Nav
-$navBackground: #434a54;
-$navHoverBackground: #3c434c;
-$navDropdownBackground: $white;
-$navBorderColor: #363b43;
-$navHeight: 60px;
-$navBreakpoint: 800px;
-$navLinkColor: $white;
-$navDropdownHeaderColor: $darkerGray;
-
-// Bottom status bar
-$bottomStatusBarHeight: 60px;
-
-// Sidebar nav
-$sidebarNavHighlightColor: #267aac;
-$sidebarNavBadgeColor: $successColor;
-
 // Corner radius
-
 $radius: 3px;
 
 // Bold font weight

data/vendor/assets/stylesheets/dvl/core/sidebar.scss

@@ -24,7 +24,7 @@
 
 .sidebar_data {
   padding: 0 1rem;
-  li {
+  > li {
     border-bottom: 1px solid $lightGray;
     padding: 0.75rem 0;
     &:first-of-type {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dvl-core
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Adam Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport