anjlab-widgets 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec99f00a18ca6d9718827c73d21a1c16ac0f7f0
-  data.tar.gz: 3fee3300ceb57043fd3bae398c700deb8802324f
+  metadata.gz: d6393b9f5ad7b950a29d3151d851e42540a864c9
+  data.tar.gz: 3f7dc68afdcfb6b1fdfabde911b05c54cfb9b7f4
 SHA512:
-  metadata.gz: 722c8309b76f2466c26dad4ece94b3e79aaa912bb83e1cd5b45ba7cd99ad3c921f095dce616514527397e1b1585d946b1236eb669f39b04f3f55857608d3fc69
-  data.tar.gz: 9140eeaa92907c37f0b282a5dd22e4e4acf756f71b11899328d7b83cb67511503aef8b739cfc596d1b134a214f0e5986861ecd368a0f193ff5758c658eefefec
+  metadata.gz: 51c79a86372996f405c4eead5357977affa86799e610cdbd540c5b06b2bc9bb58c3b8118413c2c4e45bb03d907bad0d62a5f1bacc09b911157d0e16c81978613
+  data.tar.gz: 576185d97277e09b32b2292612dfb1a77495aa89481fc65140f5d2abc0ce156709840be65f26b703e9971632f6b7c8e0b3ee7f09e7822bda708c4d07f5fdf58b

data/Gemfile

@@ -12,4 +12,4 @@ group :assets do
   gem 'jquery-rails'
 end
 
-gem 'anjlab-bootstrap-rails', require: 'bootstrap-rails'
+gem 'anjlab-bootstrap-rails', require: 'bootstrap-rails', path: '~/Projects/bootstrap-rails'

data/app/assets/javascripts/anjlab/datepicker.js.coffee

@@ -114,9 +114,9 @@ DateTools =
 
   headTemplate: '<thead>'+
             '<tr>'+
-              '<th class="prev"><i class="icon-arrow-left"/></th>'+
+              '<th class="prev"><span class="icon-left"/></th>'+
               '<th colspan="5" class="switch"></th>'+
-              '<th class="next"><i class="icon-arrow-right"/></th>'+
+              '<th class="next"><span class="icon-right"/></th>'+
             '</tr>'+
           '</thead>'
 
@@ -186,7 +186,7 @@ class Datepicker extends NativeRailsDatepicker
     }
 
     @isInput = @element.is('input');
-    @component = if @element.is('.date') then @element.find('.add-on') else false;
+    @component = if !@isInput && @element.is('.date') then @element.find('.add-on') else false;
 
     if @isInput
       @element.on {
@@ -231,7 +231,6 @@ class Datepicker extends NativeRailsDatepicker
     @showMode()
     $(document).off('mousedown', @hide) if !@isInput
 
-    @setValue()
     @element.trigger
       type: 'hide'
       date: @date
@@ -240,10 +239,10 @@ class Datepicker extends NativeRailsDatepicker
     formated = DateTools.formatDate(@date, @format)
     if !@isInput
       if @component
-        @element.find('input').prop('value', formated)
+        @element.find('input').val(formated).change()
       @element.data('date', formated)
     else
-      @element.prop('value', formated)
+      @element.val(formated).change()
 
   place: ->
     offset = if @component then @component.offset() else @element.offset()

data/app/assets/javascripts/anjlab/timepicker.js.coffee

@@ -84,7 +84,7 @@ class Timepicker extends NativeRailsTimepicker
     @picker.find("a[data-time='#{@time}']").addClass('active')
 
   setValue: ->
-    @element.prop('value', @time)
+    @element.val(@time).change()
 
   fillTimes: ->
     timeCnt = @startTime
@@ -130,7 +130,7 @@ class Timepicker extends NativeRailsTimepicker
     @picker.hide()
     $(window).off 'resize', @place
 
-    @setValue()
+    # @setValue()
     @element.trigger {
       type: 'hide'
       date: @time

data/app/assets/stylesheets/anjlab/datepicker.css.scss

@@ -3,7 +3,7 @@
   left: 0;
   padding: 4px;
   margin-top: 1px;
-  @include border-radius(4px);
+  border-radius: $border-radius-base;
 
   >div {
     display: none;
@@ -22,45 +22,45 @@
   th {
     text-align: center;
     @include square(20px);
-    @include border-radius(4px);
+    border-radius: $border-radius-base;
   }
   td {
     &.day:hover {
-      background: $grayLighter;
+      background: $gray-lighter;
       cursor: pointer;
     }
     &.old,
     &.new {
-      color: $grayLight;
+      color: $gray-light;
     }
     &.today {
       font-weight: bold;
     }
     &.active,
     &.active:hover {
-      @include button-background($btnPrimaryBackground, adjust-hue($btnPrimaryBackground, 20));
+      @include btn-pseudo-states($btn-primary-color, $btn-primary-bg, $btn-primary-border);
       color: #fff;
       text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     }
     span {
       display: block;
-      width: 47px;
+      width: 54px;
       height: 54px;
       line-height: 54px;
       float: left;
       margin: 2px;
       cursor: pointer;
-      @include border-radius(4px);
+      border-radius: $border-radius-base;
       &:hover {
-        background: $grayLighter;
+        background: $gray-lighter;
       }
       &.active {
-        @include button-background($btnPrimaryBackground, adjust-hue($btnPrimaryBackground, 20));
+        @include btn-pseudo-states($btn-primary-color, $btn-primary-bg, $btn-primary-border);
         color: #fff;
         text-shadow: 0 -1px 0 rgba(0,0,0,.25);
       }
       &.old {
-        color: $grayLight;
+        color: $gray-light;
       }
     }
   }
@@ -72,7 +72,19 @@
   thead tr:first-child th {
     cursor: pointer;
     &:hover {
-      background: $grayLighter;
+      background: $gray-lighter;
+    }
+  }
+
+  .icon-left {
+    &:before {
+      content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
+    }
+  }
+
+  .icon-right {
+    &:before {
+      content: '\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
     }
   }
 }

data/app/assets/stylesheets/anjlab/timepicker.css.scss

@@ -3,7 +3,7 @@
   left: 0;
   padding: 4px;
   margin-top: 1px;
-  @include border-radius(4px);
+  border-radius: $border-radius-base;
   height:224px;
   width:70px !important;
   min-width:70px;
@@ -14,20 +14,20 @@
   }
 
   a {
-    @include border-radius(4px);
+    border-radius: $border-radius-base;
     display: block;
     padding: 0 1em;
 
     &:hover {
-      background: $grayLighter;
+      background: $gray-lighter;
       cursor: pointer;
     }
     &.night {
-      color: $grayLight;
+      color: $gray-light;
     }
     &.active,
     &.active:hover {
-      @include button-background($btnPrimaryBackground, adjust-hue($btnPrimaryBackground, 20));
+      @include btn-pseudo-states($btn-primary-color, $btn-primary-bg, $btn-primary-border);
       color: #fff;
       text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     }

data/lib/anjlab-widgets/version.rb

@@ -1,5 +1,5 @@
 module Anjlab
   module Widgets
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

data/spec/dummy/app/views/widgets/datepicker.html.erb

@@ -1,5 +1,5 @@
 <input data-widget='datepicker' data-date-format='dd.mm.yyyy' value='05.08.2012'>
-<input data-widget='datepicker' data-date-locale='ru'>
+<input class='js-change' data-widget='datepicker' data-date-locale='ru'>
 <br>
 <input data-widget='datepicker' data-date-locale='en'>
 <input data-widget='datepicker'>
@@ -7,3 +7,8 @@
 <input data-widget='datepicker' data-date-locale='es'>
 <input data-widget='datepicker' data-date-allow-blank='false'>
 
+<script>
+$('.js-change').change(function(){
+  console.log($('.js-change').val())
+})
+</script>

data/spec/dummy/app/views/widgets/timepicker.html.erb

@@ -1 +1,7 @@
-<input data-widget='timepicker'>
+<input class="js-change" data-widget='timepicker'>
+
+<script>
+$('.js-change').change(function(){
+  console.log($('.js-change').val())
+})
+</script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-widgets
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Yury Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anjlab-bootstrap-rails