material_raingular 0.1.8.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3843138ba53c2412deeb8948b76c66cf7488e0a
-  data.tar.gz: 951646e1b9a0986bcf8cda19c79e4bfbc1e01d0e
+  metadata.gz: 0da8e34bdf3bd3f3e7fbb4802eeae30cbb3e0e37
+  data.tar.gz: c8f5bb5cb11b0116bbdab77427e76ba48a71173c
 SHA512:
-  metadata.gz: 9a318e684352621e52c4e8ea9bd30ce460d964acc4529429867b7b8da702bdc96cf5386c55f383c12756b1a8ad0ec7c71dc3068ef095ae76d88461bb4041e2ed
-  data.tar.gz: d03fca3d46600c21a41ebcacf364a6eee940338bd0358a0f61ef4636fec6a39c031f981f8f09b430a27dbd460cf2d2eaf508cc8b21d5fc5d1cca0b4df4406a12
+  metadata.gz: f750651f1a186f99dc253ec2500ba62d7d435cb1dc77c224cc52cf3d46bb27ac8c21362371d65cb4d33b4fc68b643c4314a229408d6b655214b536498cb9743c
+  data.tar.gz: 86f95b39d99dea9008e7b800f5bbbae5dd50ddb0a9c5661cdf83a898999533a23a61f6444d9668e5f4b9040908c31186b682856fd0e3ff70fb8369355881a307

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

@@ -74,9 +74,9 @@ class MobileTemplate
       @tempHolder.removeClass('active')
 
 class StandardTemplate
-  constructor: (@element,attrs,functions,@disabled,@viewOptions) ->
+  constructor: (@element,@attrs,functions,@disabled,@viewOptions,@mdInputContainer) ->
     @span            = angular.element "<span></span>"
-    @search          = angular.element "<input class='autocomplete' type='search' placeholder='" + attrs.placeholder + "'>"
+    @search          = angular.element "<input class='autocomplete' type='search'>"
     @tempHolder      = angular.element "<div class='autocomplete menu md-whiteframe-z1'>"
     @template        = @tempHolder
     @typeAhead       = angular.element "<span style='position:absolute;'></span>"
@@ -104,12 +104,16 @@ class StandardTemplate
     @search.bind 'input', (event)=>
       @inputFunction(@search,@typeAhead,event)
     @search.bind 'focus', (event)=>
+      @mdInputContainer?.setFocused(true)
       @stylize()
       @focusFunction(@template,event)
     @search.bind 'blur', (event)=>
+      @mdInputContainer?.setHasValue(@search.val())
+      @mdInputContainer?.setFocused(false)
       @blurFunction(@search,@typeAhead,@template,event)
     @search.bind 'keydown', (event)=>
       @keydownFunction(@search,@typeAhead,@template,event)
+
   attachElements: ->
     @span.append @typeAhead
     @span.append @search
@@ -215,8 +219,10 @@ class EventFunctions
 
 angular.module('FilteredSelect', [])
   .directive 'ngFilteredSelect', ($parse,$filter,$timeout)->
-    require: 'ngModel'
-    link: (scope,element,attrs,ngModel) ->
+    require: ['ngModel', '?^mdInputContainer']
+    link: (scope,element,attrs,controllers) ->
+      ngModel = controllers[0]
+      mdInputContainer = controllers[1]
       viewOptions = JSON.parse(attrs.filterOptions || '{}')
       equiv = (left,right) ->
         return true if left == right
@@ -273,9 +279,10 @@ angular.module('FilteredSelect', [])
             val = if viewScope then (functions.altValue(viewScope) || functions.viewValueFn(viewScope)).replace(/^\s+/g,'') else ''
           elements.search.val(val)
           elements.typeAhead.html(elements.search.val())
+          mdInputContainer?.setHasValue(val)
         else
           unless model = scope.$eval(attrs.ngModel)
-            view = attrs.placeholder
+            view = ''
             element.css('color','rgba(0,0,0,0.4)')
           else
             element.css('color','')
@@ -286,10 +293,11 @@ angular.module('FilteredSelect', [])
               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
+            view = if viewScope then functions.viewValueFn(viewScope) else ''
           element.html('')
           element.html(view)
 
+
       updateValue = (model) ->
         return if @clickedVal && @clickedVal != model
         $timeout =>
@@ -325,7 +333,9 @@ angular.module('FilteredSelect', [])
       if isMobile = typeof attrs.ngMobile != 'undefined'
         elements  = new MobileTemplate(element,eFunctions.mobile())
       else
-        elements  = new StandardTemplate(element,attrs,eFunctions.standard(),disabled(),viewOptions)
+        elements  = new StandardTemplate(element,attrs,eFunctions.standard(),disabled(),viewOptions,mdInputContainer)
+      mdInputContainer?.setHasPlaceholder(attrs.mdPlaceholder)
+      mdInputContainer?.input = elements.search
       scope.$watchCollection functions.collection, (newVal,oldVal) ->
         return if newVal == oldVal
         setInitialValue()

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

@@ -9,11 +9,9 @@ class ElementUpdate
     @isInput     = @tagName == 'INPUT'
     @scope       = scope
     @element     = element
-    @placeholder = attributes.placeholder
     @timeout     = timeout
     @bindInput()          if @isInput
     @bindElement()    unless @isInput
-    @setPlaceholder()     if typeof @placeholder == 'undefined'
   watcher: ->
     eu = @
     @scope.$watch @modelVal, (updated,old) ->
@@ -52,11 +50,6 @@ class ElementUpdate
         ,750
     else
       @watcher()
-  setPlaceholder: ->
-    placeholder = ''
-    for word in @modelName.split('.').pop().split('_')
-      placeholder += word[0].toUpperCase() + word[1..-1].toLowerCase() + ' '
-    @element.attr('placeholder',placeholder)
 
 angular.module 'MdUpdate', ['Factories', 'FactoryName','RailsUpdater']
   .directive 'mdUpdate', ($timeout, factoryName, $injector, RailsUpdater,$parse) ->

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.1.8.1"
+  VERSION = "0.2"
 end