material_raingular 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca25f62ed20ba508fe00801587895b28329ad328
-  data.tar.gz: 818e8b319126d6f5cb154e5ca04c598db286acc1
+  metadata.gz: d5758cbbb60a81e13a8f9ee724676bbb1daf1351
+  data.tar.gz: 003e3ccf07f0befbddd525fba209cd0cfaab8601
 SHA512:
-  metadata.gz: 4cf7d64d6dfc4921db568f48de7956fb111c5de8f70d82da582755ac80e5469b9c59b528e00e7e94b26fcf3aea18d4e2cdf9e441b6eead9a2e867a5756c5432d
-  data.tar.gz: c38201d4f38f35a97bda236dea815e03c4b7c76468ccb60540b888bb3a204d515b847c6c388004ea061aa857fa9ecaf908091dd5e9c8809255825ee13d3cf77d
+  metadata.gz: 5e7bc01cb048abdb22363ba8d000f6d9a864bf7bdf9169c525b1b9a5f7d213452f191993d5e5bea15d1c7136173058dfc3f62c7507aa4976ec787a458c4c7bb2
+  data.tar.gz: ff49fc825f94c229299489eab7d898233515121061e39d7b6129ae2391f2cb66ff6d34d84ccf4d288ebf32f45154e0edd562c8ab9bc10a1c5abb789b700184fd

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

@@ -1,3 +1,4 @@
+# TODO:: Figure out how to prevent second focus on 'phase code' from changing value... class variable on focus on blur
 class SelectOptions
   REGEXP: /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
       # 1: Model Value
@@ -23,13 +24,14 @@ PrimitiveValueFunction = (s,l,a,i) ->
   return s
 
 class SelectFunctions
-  constructor: (match,parse) ->
+  constructor: (match,parse,options) ->
     @collection   = parse(match[8])
     @modelValue   = match[1].replace(match[5] + '.','')
     @viewValue    = if match[2] then match[2].replace(match[5] + '.','') else @modelValue
     @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]
+    @altValue     = parse(options.showAs)
 
 class MobileTemplate
   constructor: (@element,functions) ->
@@ -230,7 +232,6 @@ angular.module('FilteredSelect', [])
           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)
-        console.dir fList
         for filter in options.filters
           [filterType,value] = filter.replace(/\s+/,'').split(':')
           fList = $filter(filterType)(fList, value)
@@ -262,7 +263,7 @@ angular.module('FilteredSelect', [])
               obj[functions.modelValue] = model
             list = $filter('filter')(functions.collection(scope), obj,equiv)
             viewScope = list[0] if list
-            val = if viewScope then functions.viewValueFn(viewScope).replace(/^\s+/g,'') else ''
+            val = if viewScope then (functions.altValue(viewScope) || functions.viewValueFn(viewScope)).replace(/^\s+/g,'') else ''
           elements.search.val(val)
           elements.typeAhead.html(elements.search.val())
         else
@@ -308,7 +309,7 @@ angular.module('FilteredSelect', [])
         return false
 
       options     = new SelectOptions(attrs.ngSelectOptions,element[0].outerHTML)
-      functions   = new SelectFunctions(options.match,$parse)
+      functions   = new SelectFunctions(options.match,$parse,viewOptions)
       eFunctions  = new EventFunctions(functions,buildTemplate,updateValue,filteredList,$filter,$timeout,$parse,scope,disabled,viewOptions)
       if isMobile = typeof attrs.ngMobile != 'undefined'
         elements  = new MobileTemplate(element,eFunctions.mobile())

data/lib/material_raingular/version.rb

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

metadata

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