material_raingular 0.1.5.7 → 0.1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87900cb5cfda046b66f490c362d69815a356ecfc
-  data.tar.gz: 903cad3836f5f800e41105557abf660bb7ebe9e6
+  metadata.gz: 0e0393643725a1838a50e538e3ad917ee4a4133c
+  data.tar.gz: 9590d088ae6c6c8e8aadf617b6bb1e652887db77
 SHA512:
-  metadata.gz: e0fda726acb4457345625ccf31e73a6b01c6eff27b7818994dba3dff82cef514428f6b98cf07a51f46c18a3916e8634e06e48ce66f0e45dcff1fbe5e32fe22e1
-  data.tar.gz: 364dc80a2a99d10e29575375d52f856d17c852cf04b3a3cc0c9c34acdac66e1f55e31f00a951cb80e8abb2b65ace9127df4c3922da91c5b7224e22af7e65fd9e
+  metadata.gz: 74c5784dbbb8f964d0b2b36a0942b8244c53bf081172bd376aa8951a542e8bb664f673365dc0a592c7c31501a5bcd6f85f5d5e5fe37972441940611009208095
+  data.tar.gz: 4efdc8a22b21d67bda209d75374b44fedafaa12bc5717286b33fccba1f61d1a67b3e2b0cac2d99a7fec9a156c6da796089a7c8775dba98d829990e9a257cde03

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

@@ -25,6 +25,7 @@ PrimitiveValueFunction = (s,l,a,i) ->
 
 class SelectFunctions
   constructor: (match,parse,options) ->
+    @repeater     = match[5]
     @collection   = parse(match[8])
     @modelValue   = match[1].replace(match[5] + '.','')
     @viewValue    = if match[2] then match[2].replace(match[5] + '.','') else @modelValue
@@ -116,7 +117,7 @@ class StandardTemplate
     @element.append @tempHolder
 
 class EventFunctions
-  constructor: (@functions,@buildTemplate,@updateValue,@filteredList,@filter,@timeout,@parse,@scope,@disabled,@options) ->
+  constructor: (@functions,@buildTemplate,@updateValue,@filteredList,@filter,@timeout,@parse,@scope,@disabled,@options,@changeFn) ->
 
   inputFunction: (search,typeAhead,event) =>
     location = search[0].selectionStart
@@ -155,8 +156,9 @@ class EventFunctions
         obj[@functions.viewValue] = search.val()
       collection = @functions.collection(@scope)
       if @options.allowNew
-        collection.push(obj) unless collection.includes(obj)
+        collection.push(obj) unless collection.pluck(@functions.viewValue).includes(obj[@functions.viewValue])
       val = @filteredList(!@options.allowNew,false,@options.allowNew,true)[0]
+      @changeFn(@scope)(val) if @changeFn
       @updateValue @functions.modelValueFn(val)
 
   keydownFunction: (search,typeAhead,template,input) =>
@@ -313,10 +315,10 @@ angular.module('FilteredSelect', [])
         form ||= element[0]
         return true if form.disabled
         return false
-
+      changeFn    = if attrs.fsChange then $parse(attrs.fsChange) else null
       options     = new SelectOptions(attrs.ngSelectOptions,element[0].outerHTML)
       functions   = new SelectFunctions(options.match,$parse,viewOptions)
-      eFunctions  = new EventFunctions(functions,buildTemplate,updateValue,filteredList,$filter,$timeout,$parse,scope,disabled,viewOptions)
+      eFunctions  = new EventFunctions(functions,buildTemplate,updateValue,filteredList,$filter,$timeout,$parse,scope,disabled,viewOptions,changeFn)
       if isMobile = typeof attrs.ngMobile != 'undefined'
         elements  = new MobileTemplate(element,eFunctions.mobile())
       else

data/lib/assets/javascripts/extensions.coffee

@@ -43,7 +43,9 @@ Array.prototype.sum = ->
     total += parseFloat(i) if i
   total
 Array.prototype.includes = (entry)->
-  this.indexOf(entry) > -1
+  unless entry.hasOwnProperty('id')
+    return @.indexOf(entry) > -1
+  @.pluck('id').includes(entry.id)
 Array.prototype.drop = (entry)->
   if entry.hasOwnProperty('id')
     index = @.pluck('id').indexOf(entry.id)

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.1.5.7"
+  VERSION = "0.1.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.1.5.7
+  version: 0.1.5.8
 platform: ruby
 authors:
 - Chris Moody