atlas_assets 0.8.10 → 0.8.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmFlZjdmYjhkZTNjNjMxNmI4N2FmNTFmZmJkNDQwN2I4MmEzNTcwYw==
+    ZWNmZjkyZDJlNTA4ZmMxYzQyNTg0NDdjMGQwMzkwOTJkYTg4MDE1Mw==
   data.tar.gz: !binary |-
-    NDZhMzNmY2UxNjBmYzliN2E2ZTlmOTNhYjlkNDc5YTEwZTFkMjA3NQ==
+    YzNkNDExYTRkMjU0NzkyMmE1NjlkZTc0ZTUwOGI1NzNiYTVhYTRjMA==
 SHA512:
   metadata.gz: !binary |-
-    Zjc0MmRjMGFmNzJlOTAwYzkxNmY4MzA1ZDUzNDkyNzcxZmZjNTBiMDY4OTA3
-    YWY1MGNlNWRjYTY4YjdmNjI1NTFhNzMyMjIyN2QzZGE4MDVmMDkxMzYyNDhl
-    Nzg0OGU0YzRmNzFiN2JlY2M3NTgwMDcwODVmOWUxMDE4ZmNiNTk=
+    MTEyYmQ1ZWIzNGYzNmQ1MjAxNDhiYjI1ZDUwOTFmYjg3ZGZkNGViMGMyOTJl
+    MGJjMTczMDljOWYwMzkwNTIxMDRlNWE4OTJkYTRmMmJmYzk2OGQ4OTUwODE5
+    MTFlODQyMDJjY2E5OWYzNDYwNzdiNDA3ZmExZmYxZmQ1ZDcyYWQ=
   data.tar.gz: !binary |-
-    MGQzNjIzYzQzODAwMzc0ZTQ5NjI5OTc0MzJmYmExNmI5YjZkZGM2ZjNjZjBh
-    YzA0ZjhiYTE0NmVkMDM0OWEzNjcyNDE3NDA2NjNkNTk2MjNiYTJiZTc3ZTU3
-    NWI1MDE3MDA3ODEzYzQ1MzU2ZGVmYmIxYmRhZWYzODJjMWEwNjA=
+    NTg0Nzc3YTIyZmFmMTQ1OGUwNjRjMDg1YjBhMDkxYzRkYWUyMmJmOGUxYTQy
+    NmQyYzIxMTk0MGJmYzUyNTYzOGRkYTRiNjkzNmJhMmFhODExODc1MWYxODdl
+    MTZiNGE1MDdlY2YwMGI2M2FiODQ4MzlhOTUzZmI5YmIyYTJjNTA=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atlas_assets (0.8.9)
+    atlas_assets (0.8.10)
       handlebars_assets (= 0.17.1)
 
 GEM
@@ -10,7 +10,7 @@ GEM
     blankslate (2.1.2.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    classifier-reborn (2.0.1)
+    classifier-reborn (2.0.2)
       fast-stemmer (~> 1.0)
     coderay (1.0.9)
     coffee-script (2.3.0)
@@ -23,9 +23,9 @@ GEM
       eco-source
       execjs
     eco-source (1.1.0.rc.1)
-    execjs (2.2.1)
+    execjs (2.2.2)
     fast-stemmer (1.0.2)
-    ffi (1.9.5)
+    ffi (1.9.6)
     handlebars_assets (0.17.1)
       execjs (>= 1.2.9)
       multi_json
@@ -33,7 +33,7 @@ GEM
       tilt
     hike (1.2.3)
     hitimes (1.2.2)
-    jekyll (2.4.0)
+    jekyll (2.5.1)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
@@ -48,7 +48,7 @@ GEM
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-assets (0.10.0)
+    jekyll-assets (0.11.0)
       jekyll (~> 2.0)
       sass (~> 3.2)
       sprockets (~> 2.10)
@@ -57,12 +57,12 @@ GEM
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
     jekyll-gist (1.1.0)
-    jekyll-paginate (1.0.0)
+    jekyll-paginate (1.1.0)
     jekyll-sass-converter (1.2.1)
       sass (~> 3.2)
-    jekyll-watch (1.1.1)
+    jekyll-watch (1.1.2)
       listen (~> 2.7)
-    kramdown (1.4.2)
+    kramdown (1.5.0)
     liquid (2.6.1)
     listen (2.7.11)
       celluloid (>= 0.15.2)
@@ -87,10 +87,10 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.1.2)
+    redcarpet (3.2.0)
     safe_yaml (1.0.4)
     sass (3.2.19)
-    sprockets (2.12.2)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -103,7 +103,7 @@ GEM
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
-    toml (0.1.1)
+    toml (0.1.2)
       parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 

data/docs/_posts/2014-05-05-select.md

@@ -67,7 +67,9 @@ select2.on('change', function (model) {
 
 You can also define a value that is different from the visible label, deactivate sorting of options and define a default option.
 
-<div id="collection-example-b"></div>
+<div id="collection-example-b"></div> 
+<a id="get-current-value" class="btn" href="#">Get current value</a>
+<a id="get-current-model" class="btn" href="#">Get current model</a>
 
 ~~~js
 var select2b = new classes.SelectView({
@@ -124,6 +126,15 @@ $('#collection-example-b').html(select2b.render().el)
 select2b.on('change', function (model) {
     $('#collection-example-b').append(model.get('label'))
 })
+$('#get-current-value').click(function(e){
+    e.preventDefault();
+   $('#collection-example-b').append(select2b.get_value() );
+});
+$('#get-current-model').click(function(e){
+    e.preventDefault();
+    console.log(select2b.get_model())
+   $('#collection-example-b').append(select2b.get_model().attributes.toString() );
+});
 
 </script>
 

data/lib/assets/javascripts/views/select.coffee

@@ -20,19 +20,22 @@ class classes.SelectView extends Backbone.View
   initialize: (options) ->
     @rendered = false
 
-    @label = if options.label then options.label else @defaults.label
-    @value = if options.value then options.value else false
-    @default_to= if options.default_to then options.default_to else false
-    @sort = if options.sort? then options.sort else @defaults.sort
-    @helper =options.helper if options.helper?
+    @label      = if options.label? then options.label else @defaults.label
+    @value      = if options.value? then options.value else false
+    @default_to = if options.default_to? then options.default_to else false
+    @sort       = if options.sort? then options.sort else @defaults.sort
+    @helper     = options.helper if options.helper?
     
     # The select view needs a collection.
     if !@collection
       @collection = @collection_from_values(options.values)
     else if @collection.length > 0
       t = @
-      @collection.each (model) -> t.set_model_attributes(model)
-
+      @collection.each (model) ->
+        t.set_model_attributes(model)
+    else 
+      throw new Error "Select needs either a collection or an array of values"
+     
     @template = JST["templates/select"]
     @listenTo(@collection, 'add', @add_model)
     @listenTo(@collection, 'remove', @render)
@@ -50,12 +53,11 @@ class classes.SelectView extends Backbone.View
   add_model: (m) ->
     @set_model_attributes(m)
     select_el = @$el.find('select').first()
-    value = "value='" + m.get('value') + "'" if m.get('value')
+    value = if m.get('value') then "value='#{m.get('value')}'" else ""
     select_el.append("<option #{value}>#{m.get('label')}</option>")
 
     sort_by_name = (a, b) ->
-      a.innerHTML.toLowerCase().localeCompare(b.innerHTML.toLowerCase())
-
+      a.innerHTML.trim().toLowerCase().localeCompare(b.innerHTML.trim().toLowerCase())
     options = select_el.children().get()
     options = options.sort(sort_by_name) if @sort
     for opt in options
@@ -80,9 +82,9 @@ class classes.SelectView extends Backbone.View
 
     @select.on('change', (v) ->
       if t.value
-        selected_model = t.collection.find((model) -> model.get(t.value) is v.value)
+        selected_model = t.collection.find( (model) -> model.get(t.value) is v.value)
       else
-        selected_model = t.collection.find((model) -> model.get(t.label) is v.value)
+        selected_model = t.collection.find( (model) -> model.get(t.label) is v.value)
       
       t.trigger('change', selected_model)
     )
@@ -90,8 +92,8 @@ class classes.SelectView extends Backbone.View
   get_value: -> @select.value
   get_model: ->
     value = @select.value
-    if model.get('value')
-      @collection.find (model) => model.get('value') is value
+    if @value
+      @collection.find (model) => model.get('value') is value or model.get('label') is value
     else
       @collection.find (model) => model.get('label') is value
 

data/lib/atlas_assets/version.rb

@@ -1,5 +1,5 @@
 module Atlas
 	module Assets
-		VERSION = "0.8.10"
+		VERSION = "0.8.11"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atlas_assets
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - Rune Skjoldborg Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars_assets