material_raingular 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7420a6e01c283917cb97615df004d13474b5388a
-  data.tar.gz: dcab33fe3307b14c36b1e4f895c67d5983faccee
+  metadata.gz: ca25f62ed20ba508fe00801587895b28329ad328
+  data.tar.gz: 818e8b319126d6f5cb154e5ca04c598db286acc1
 SHA512:
-  metadata.gz: 0d0ea8125a33948cf5f406cd27110305ceb2e0475f1516784828599a45bd73eeac94e5c21b500906271938fd805a5c9a73e0c50642d1382202e7e6c9ea4eb39c
-  data.tar.gz: 30fb7edfd244066b7dd091bf405c9e470abfa6575650e4e5b0e178b3218635a21d5624e39eead40a13b290357ed0f009f3d561e66c193e8fcf336527d33e18bf
+  metadata.gz: 4cf7d64d6dfc4921db568f48de7956fb111c5de8f70d82da582755ac80e5469b9c59b528e00e7e94b26fcf3aea18d4e2cdf9e441b6eead9a2e867a5756c5432d
+  data.tar.gz: c38201d4f38f35a97bda236dea815e03c4b7c76468ccb60540b888bb3a204d515b847c6c388004ea061aa857fa9ecaf908091dd5e9c8809255825ee13d3cf77d

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

@@ -116,9 +116,11 @@ class EventFunctions
 
   inputFunction: (search,typeAhead,event) =>
     location = search[0].selectionStart
-    if location > 3
+    if location > (@options.minLength || 4) - 1
       if @functions.viewValueFn(@filteredList()[0])
-        search.val(@functions.viewValueFn(@filteredList()[0]).replace(/^\s+/g,''))
+        search.val(search.val()[0..location - 1])
+        unless [8,46].includes(@keyholder)
+          search.val(@functions.viewValueFn(@filteredList()[0]).replace(/^\s+/g,'')) if search.val().toLowerCase() == @functions.viewValueFn(@filteredList()[0]).replace(/^\s+/g,'')[0..location - 1].toLowerCase()
       else
         search.val(search.val()[0..location - 1].replace(/^\s+/g,''))
       search[0].setSelectionRange(location,location)
@@ -140,15 +142,21 @@ class EventFunctions
     template.removeClass('focused')
     @setTypeAheadScroll(search,typeAhead)
     if search.val().length < (@options.minLength || 4)
-      search.val('')
+      @updateValue('')
     else
-      obj={}
-      obj[@functions.viewValue] = search.val()
-      val = @filter('filter')(@functions.collection(@scope), obj)[0]
+      if @functions.isPrimative
+        obj = search.val()
+      else
+        obj={}
+        obj[@functions.viewValue] = search.val()
+      collection = @functions.collection(@scope)
+      if @options.allowNew
+        collection.push(obj) unless collection.includes(obj)
+      val = @filter('filter')(collection, obj, !!@options.allowNew)[0]
       @updateValue @functions.modelValueFn(val)
-      search.val(@functions.viewValueFn(val).replace(/^\s+/g,''))
 
   keydownFunction: (search,typeAhead,template,input) =>
+    @keyholder = input.keyCode
     @setTypeAheadScroll(search,typeAhead)
     keypress = (direction) ->
       index = if direction == 'next' then 0 else template.find('a').length - 1
@@ -203,6 +211,7 @@ angular.module('FilteredSelect', [])
   .directive 'ngFilteredSelect', ($parse,$filter,$timeout)->
     require: 'ngModel'
     link: (scope,element,attrs,ngModel) ->
+      viewOptions = JSON.parse(attrs.filterOptions || '{}')
       equiv = (left,right) ->
         return true if left == right
         return true if (!!left && !!right) == false
@@ -220,7 +229,8 @@ angular.module('FilteredSelect', [])
           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)
+        fList = $filter('orderBy')($filter('filter')(functions.collection(scope), obj,bool), viewOptions.orderBy || functions.viewValue)
+        console.dir fList
         for filter in options.filters
           [filterType,value] = filter.replace(/\s+/,'').split(':')
           fList = $filter(filterType)(fList, value)
@@ -243,6 +253,7 @@ angular.module('FilteredSelect', [])
           elements.template.append(li)
       setInitialValue = ->
         unless isMobile
+          val = ''
           if model = scope.$eval(attrs.ngModel)
             if functions.isPrimative
               obj = model
@@ -251,8 +262,9 @@ angular.module('FilteredSelect', [])
               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 '')
-            elements.typeAhead.html(elements.search.val())
+            val = if viewScope then functions.viewValueFn(viewScope).replace(/^\s+/g,'') else ''
+          elements.search.val(val)
+          elements.typeAhead.html(elements.search.val())
         else
           unless model = scope.$eval(attrs.ngModel)
             view = attrs.placeholder
@@ -272,7 +284,7 @@ angular.module('FilteredSelect', [])
 
       updateValue = (model) ->
         scope.$apply ->
-          ngModel.$setViewValue(model)
+          ngModel.$setViewValue(model || '')
           elements.tempHolder.removeClass('active')
           setInitialValue()
       disabled = ->
@@ -295,7 +307,6 @@ angular.module('FilteredSelect', [])
         return true if form.disabled
         return false
 
-      viewOptions = JSON.parse(attrs.filterOptions || '{}')
       options     = new SelectOptions(attrs.ngSelectOptions,element[0].outerHTML)
       functions   = new SelectFunctions(options.match,$parse)
       eFunctions  = new EventFunctions(functions,buildTemplate,updateValue,filteredList,$filter,$timeout,$parse,scope,disabled,viewOptions)

data/lib/assets/javascripts/directives/mdupdate.coffee

@@ -13,7 +13,7 @@ class ElementUpdate
     @timeout     = timeout
     @bindInput()          if @isInput
     @bindElement()    unless @isInput
-    @setPlaceholder() unless @placeholder
+    @setPlaceholder()     if typeof @placeholder == 'undefined'
   watcher: ->
     eu = @
     @scope.$watch @modelVal, (updated,old) ->

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler