material_raingular 0.0.4.2.1 → 0.0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18193f16394298e1cc7af1f636b7ebc986fedc3d
-  data.tar.gz: b612c444e8029453cec479f5ecb596f66c03c418
+  metadata.gz: 8d1099f86d79c7a785d7a04c0ecee5bab2a6b94d
+  data.tar.gz: fcfb376bb6e54f7162892dc1295dcf33a43632e6
 SHA512:
-  metadata.gz: d41a7c58e35a2e24065e99f69f7b50c013f8c26d591b8e6d9acf8911a6a0470114be4e2ce05e45d7dd26329b314e54d4af89cbcdce5def2e2723e685d7d1d460
-  data.tar.gz: d193dbae32b24a0612189895c9296aef13e184457157f5a07c25ef4d63f4b7a32b201a320058c11d3512efba964736d995da871e503f5bb33a2c994848075486
+  metadata.gz: 47379b9618bfffa903291868cb06d6f857f10c9654f40c0c51e3d9c604e4bb5079ea59a236346f2f76e0b7bd142dbb5da208c2e08ffcbf517e580ff8d9ab3307
+  data.tar.gz: 7d50f1205b362df6e66f74c3a7d05894dbb0a71b0722760505282e6259c061f877cec9af0834772637a4c82612492d62b1bc53df91d458bccfca84ca1fabf762

data/lib/assets/javascripts/directives/filteredselect.js.coffee

@@ -19,13 +19,17 @@ class SelectOptions
       "Expected expression in form of " +
       "'_select_ (as _label_)? for (_key_,)?_value_ in _collection_'" +
       " but got '" + @unparsed + "'. Element: " + @html)
+PrimitiveValueFunction = (s,l,a,i) ->
+  return s
+
 class SelectFunctions
   constructor: (match,parse) ->
     @collection   = parse(match[8])
     @modelValue   = match[1].replace(match[5] + '.','')
     @viewValue    = if match[2] then match[2].replace(match[5] + '.','') else @modelValue
-    @viewValueFn  = parse(@viewValue || @modelValue)
-    @modelValueFn = parse(@modelValue || @viewValue)
+    @modelValueFn = if @modelValue == match[5] then PrimitiveValueFunction else parse(@modelValue || @viewValue)
+    @viewValueFn  = if @viewValue  == match[5] then PrimitiveValueFunction else parse(@viewValue || @modelValue)
+    @isPrimative  =    @viewValue  == match[5]
 
 class MobileTemplate
   constructor: (@element,functions) ->
@@ -203,8 +207,11 @@ angular.module('FilteredSelect', [])
           bool = (left,right) ->
             !!left.match(new RegExp("^" + right))
         location = elements.search[0].selectionStart || elements.search.val().length
-        obj={}
-        obj[functions.viewValue] = elements.search.val()[0..location - 1].replace(/^\s+/g,'') || ''
+        if functions.isPrimative
+          obj = elements.search.val()[0..location - 1].replace(/^\s+/g,'') || ''
+        else
+          obj={}
+          obj[functions.viewValue] = elements.search.val()[0..location - 1].replace(/^\s+/g,'') || ''
         return unless functions.collection(scope)
         fList = $filter('orderBy')($filter('filter')(functions.collection(scope), obj,bool), functions.viewValue)
         for filter in options.filters
@@ -221,15 +228,20 @@ angular.module('FilteredSelect', [])
             li = angular.element '<a class="item">' + functions.viewValueFn(item) + '</a>'
           ip = angular.element '<input type="hidden">'
           ip.val(functions.modelValueFn(item))
+          ip[0].setAttribute('ng-data-type',typeof functions.modelValueFn(item))
           li.append(ip)
           li.bind 'mousedown', ($event)->
-            updateValue($event.target.children[0].value)
+            val = ($event.target.children[0].value)["to_" + $event.target.children[0].getAttribute('ng-data-type')]()
+            updateValue(val)
           elements.template.append(li)
       setInitialValue = ->
         unless isMobile
           if model = scope.$eval(attrs.ngModel)
-            obj = {}
-            obj[functions.modelValue] = scope.$eval(attrs.ngModel)
+            if functions.isPrimative
+              obj = model
+            else
+              obj = {}
+              obj[functions.modelValue] = model
             list = $filter('filter')(functions.collection(scope), obj,equiv)
             viewScope = list[0] if list
             elements.search.val(if viewScope then functions.viewValueFn(viewScope).replace(/^\s+/g,'') else '')
@@ -240,8 +252,11 @@ angular.module('FilteredSelect', [])
             element.css('color','rgba(0,0,0,0.4)')
           else
             element.css('color','')
-            obj = {}
-            obj[functions.modelValue] = model
+            if functions.isPrimative
+              obj = model
+            else
+              obj = {}
+              obj[functions.modelValue] = model
             list = $filter('filter')(functions.collection(scope), obj,true)
             viewScope = list[0] if list
             view = if viewScope then functions.viewValueFn(viewScope) else attrs.placeholder

data/lib/assets/javascripts/directives/ngslide.js.coffee

@@ -61,6 +61,7 @@ angular.module('NgSlide', [])
           else
             element.css(margin, start)
       setHeight = (element) ->
+        return if params[2].resize == 'false'
         rect    = element[0].getBoundingClientRect()
         content = angular.element('.content')[0].getBoundingClientRect()
         height  = rect.height + rect.top - content.top unless params[0] == 'down'
@@ -69,7 +70,7 @@ angular.module('NgSlide', [])
       scope.$watch params[1], (newValue, oldValue)->
         if params[2].auto
           start = calcStart(element[0])
-          end = 0 + 'px'
+          end = params[2].finalMargin || 0 + 'px'
         if newValue
           PreviousHeight.set(angular.element('.content')[0].getBoundingClientRect().height)
           element.css(margin, end)
@@ -79,4 +80,4 @@ angular.module('NgSlide', [])
         else
           watcher() if watcher
           element.css(margin, start)
-          angular.element('.content').css('height', PreviousHeight.get())
+          angular.element('.content').css('height', PreviousHeight.get())

data/lib/assets/javascripts/extensions.coffee

@@ -1,3 +1,9 @@
+String.prototype.to_number = ->
+  Number(this)
+String.prototype.to_string = ->
+  this.toString()
+String.prototype.to_date = ->
+  new Date(this)
 Array.prototype.empty = ->
   this.length == 0
 Array.prototype.present = ->
@@ -39,6 +45,7 @@ Array.prototype.sum = ->
 Array.prototype.includes = (entry)->
   this.indexOf(entry) > -1
 Array.prototype.drop = (entry)->
+  return this unless this.indexOf(entry) > -1
   this.splice(this.indexOf(entry),1)
 String.prototype.titleize = ->
   return this.replace(/\_/g,' ').replace(/([A-Z])/g, ' $1').trim().replace(/\b[a-z]/g, (letter)->

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.0.4.2.1"
+  VERSION = "0.0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2.1
+  version: 0.0.4.3
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler