material_raingular 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5758cbbb60a81e13a8f9ee724676bbb1daf1351
-  data.tar.gz: 003e3ccf07f0befbddd525fba209cd0cfaab8601
+  metadata.gz: f66bf16eb66fabb42468ea92f44cb92f85359534
+  data.tar.gz: 684e58c7df7473f04b3afcec0a33fb25b9c61689
 SHA512:
-  metadata.gz: 5e7bc01cb048abdb22363ba8d000f6d9a864bf7bdf9169c525b1b9a5f7d213452f191993d5e5bea15d1c7136173058dfc3f62c7507aa4976ec787a458c4c7bb2
-  data.tar.gz: ff49fc825f94c229299489eab7d898233515121061e39d7b6129ae2391f2cb66ff6d34d84ccf4d288ebf32f45154e0edd562c8ab9bc10a1c5abb789b700184fd
+  metadata.gz: 6f4c6cc6b92dc6d2fce3e22e32c031f0b4207a5b2dc548231deda26a2786c4c4f841d61745876e7ce473677fb07144b86be5b2d6f44bc05af537dcfea59f09fa
+  data.tar.gz: fe0a299756ac4b72a5f325f5d1a0d1f05fc307356469fb635f03ad3ed244bbfb4948192d90411f3473e0b2b6ee74c8af6b73f090286e0bf03b16f20992ce5ee7

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

@@ -154,7 +154,7 @@ class EventFunctions
       collection = @functions.collection(@scope)
       if @options.allowNew
         collection.push(obj) unless collection.includes(obj)
-      val = @filter('filter')(collection, obj, !!@options.allowNew)[0]
+      val = @filteredList(true,false,@options.allowNew)[0]
       @updateValue @functions.modelValueFn(val)
 
   keydownFunction: (search,typeAhead,template,input) =>
@@ -220,16 +220,21 @@ angular.module('FilteredSelect', [])
         if !isNaN(left) && !isNaN(right)
           return true if parseFloat(left) == parseFloat(right)
         false
-      filteredList = (bool)->
+      filteredList = (bool,model,exact)->
         if bool
           bool = (left,right) ->
             !!left.match(new RegExp("^" + right))
+        if exact
+          bool = (left,right) -> left == right
         location = elements.search[0].selectionStart || elements.search.val().length
         if functions.isPrimative
-          obj = elements.search.val()[0..location - 1].replace(/^\s+/g,'') || ''
+          obj = if model then scope.$eval(attrs.ngModel) else elements.search.val()[0..location - 1].replace(/^\s+/g,'') || ''
         else
           obj={}
-          obj[functions.viewValue] = elements.search.val()[0..location - 1].replace(/^\s+/g,'') || ''
+          if model
+            obj[functions.modelValue] = scope.$eval(attrs.ngModel)
+          else
+            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), viewOptions.orderBy || functions.viewValue)
         for filter in options.filters
@@ -248,21 +253,16 @@ angular.module('FilteredSelect', [])
           ip.val(functions.modelValueFn(item))
           ip[0].setAttribute('ng-data-type',typeof functions.modelValueFn(item))
           li.append(ip)
-          li.bind 'mousedown', ($event)->
+          li.bind 'mousedown', ($event)=>
             val = ($event.target.children[0].value)["to_" + $event.target.children[0].getAttribute('ng-data-type')]()
+            @clickedVal = val
             updateValue(val)
           elements.template.append(li)
       setInitialValue = ->
         unless isMobile
           val = ''
           if model = 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
+            viewScope = filteredList(true,true,true)[0]
             val = if viewScope then (functions.altValue(viewScope) || functions.viewValueFn(viewScope)).replace(/^\s+/g,'') else ''
           elements.search.val(val)
           elements.typeAhead.html(elements.search.val())
@@ -284,6 +284,10 @@ angular.module('FilteredSelect', [])
           element.html(view)
 
       updateValue = (model) ->
+        return if @clickedVal && @clickedVal != model
+        $timeout ->
+          delete @clickedVal
+        , 300
         scope.$apply ->
           ngModel.$setViewValue(model || '')
           elements.tempHolder.removeClass('active')

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Chris Moody
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Angular v1.4 for rails. Angular Material v0.9.8.