atlas_assets 0.8.7 → 0.8.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGFjOTQ1ZTMwMDZmZDI3NjE2N2U0OWQ1MzY4ZjU3OGFhMWI1YmY4Mg==
+    YTczOWNhNjBhYzQ2Y2UwMTQwMzM0MWQwZWMwOTlkY2E2Nzc5NmU3OA==
   data.tar.gz: !binary |-
-    NjU4NDhmMDMyOTBlZmQ2ZTZmNTk3OGRmMGNlYmI0ZTllMGE4ZjhiYw==
+    ZGFlMGQ4ODM5NjZhOWE5ZmEwOTIyZjk3M2VhNzBiZWYxMDM3MTNkYg==
 SHA512:
   metadata.gz: !binary |-
-    MjFjNzc0ZGViZmE1OWMzNDJhYjcwMDVhMzc1MmEwNzRhZTgwMzVkZjIyMDc1
-    MTQ1Y2VmM2VhNzIyY2I1ZDFhYzhkMjE3ZGMyNzAwYTYyM2YwYTM0ZTViMGVk
-    Y2NmNWQ2ZTJjMWNmNjVkMzk0YjQxMjVhNjgyMTlkOTkxODU5YmM=
+    ZjA4Y2RhMzQxY2U3MWUxZGU2YTc1YWQ3MDdlY2YzMGZlNDE2ZDIwZWQ0YTg0
+    ODhmMmU3NzgwZTdkNWYxYzNmNzk3Nzk5ZTk0NGY2NzlhYTNkOTFlMzQ0ZmEz
+    YzhkOGQzZGViMWExMzZlNjI4MTY4NjNkMWFiZjc3YWYxNmJhMjA=
   data.tar.gz: !binary |-
-    NTI1NGI3OGEzM2VkMDlhYTlhNTg3OGU0MDZjM2U3MzE2MWI4MmQ0NzcyMjU0
-    MzcyNTg2MDIwMTQ2YjRhNWZlZWFlNjlhYjk5OGU4OGRmNjI4YTgyODY3NDI2
-    NjdiMTk1NjkwMmM4MzI5YzMwNDFkYmNiNjZjNzQyMWE0MmZjMTc=
+    NGRiNmQzMWYwZDhjNTVmYTJkODJhOTgyZDc5NmFlOWNmMGI3ZGNlMmZkNmQ2
+    YmIzODkwNTI0YzA0MjM2ODlkMDg3NDJjYWQwYzE1NTU3NzAxNGQyNzAyOTBi
+    MmYzNzNhYmE1M2ZlN2Q3YWZjNmZlMTRjYzFkMzRlYTc3MDg4YmY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atlas_assets (0.8.7)
+    atlas_assets (0.8.8)
       handlebars_assets (~> 0.15)
 
 GEM

data/docs/_posts/2013-10-28-dropdown.md

@@ -5,6 +5,9 @@ title:  "Dropdowns"
 
 Dropdowns
 ======
+<div class="flash">
+    <div class="flash-item error">This dropdown is deprecated! use <a href="{% post_url 2014-05-05-select %}">Select View</a> instead.</div>
+</div>
 
 
 The Dropdown is a site wide BackboneView helper using the [Chosen](http://harvesthq.github.io/chosen/) Javascript library.

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

@@ -51,11 +51,11 @@ To implement a SelectView with a Backbone Collection, you must pass both a colle
 ~~~js
 var select2 = new classes.SelectView({
     collection: new Backbone.Collection([
-        {name:"Rune", key:"madsen"},
-        {label:"Steve", key:"klise"},
-        {label:"Zach", key:"Schwartz"}
+        {first:"Rune", last:"Madsen"},
+        {first:"Steve", last:"Klise"},
+        {first:"Zach", last:"Schwartz"}
     ]),
-    label: "name",
+    label: "first",
 })
 $('#collection-example').html(select2.render().el)
 
@@ -65,6 +65,31 @@ 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>
+
+~~~js
+var select2b = new classes.SelectView({
+    collection: new Backbone.Collection([
+        {name:"toc", prettyname:"Table of Contents"},
+        {name:"chapter", prettyname:"Chapter"},
+        {name:"sect1", prettyname:"Section1"},
+    ]),
+    label: "prettyname",
+    value: "name",
+    sort: false,
+    default: 'chapter'
+})
+$('#collection-example-b').html(select2b.render().el)
+
+// Listen for changes
+select2b.on('change', function (model) {
+    $('collection-example-b').append(model.get('key'))
+})
+~~~
+
+
 <script>
 var select2 = new classes.SelectView({
     collection: new Backbone.Collection([
@@ -78,8 +103,28 @@ $('#collection-example').html(select2.render().el)
 
 // Listen for changes
 select2.on('change', function (model) {
-    $('#collection-example').append(model.get('key'))
+    console.log(model);
+    $('#collection-example').append(model.get('name'))
 })
+
+var select2b = new classes.SelectView({
+    collection: new Backbone.Collection([
+        {name:"toc", prettyname:"Table of Contents"},
+        {name:"chapter", prettyname:"Chapter"},
+        {name:"sect1", prettyname:"Section1"},
+    ]),
+    label: "prettyname",
+    value: "name",
+    sort: false,
+    default: 'chapter',
+})
+$('#collection-example-b').html(select2b.render().el)
+
+// Listen for changes
+select2b.on('change', function (model) {
+    $('#collection-example-b').append(model.get('label'))
+})
+
 </script>
 
 ## Adding a Model

data/lib/assets/javascripts/templates/select.jst.eco

@@ -4,7 +4,13 @@
 <% end %>
 <select class="dropdown-list" <%= if @multiple: %>multiple<% end %> <%= if @placeholder?: %>data-placeholder='<%= @placeholder %>'<% end %>>
   <% for model in @models: %>
-  <option <% if model.selected?: %>selected<% end %> <% if model.disabled: %>disabled<% end %>><%= model.get('label') %></option>
+  <option 
+    <% if model.get('selected'): %>selected<% end %>
+    <% if model.get('disabled'): %>disabled<% end %>
+    <% if model.get('value'): %>value="<%= model.get('value') %>"<% end %>
+  >
+    <%= model.get('label') %>
+  </option>
   <% end %>
 </select>
 <% if @helper?: %>

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

@@ -15,20 +15,23 @@
 
 class classes.SelectView extends Backbone.View
 
-  defaults: {label: 'label'}
+  defaults: {label: 'label', value: 'value', sort : true}
 
   initialize: (options) ->
     @rendered = false
 
-    @label = if options.label then options.label else "label"
-    @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= if options.default then options.default 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,@label) -> t.set_model_label(model)
+      @collection.each (model) -> t.set_model_attributes(model)
 
     @template = JST["templates/select"]
     @listenTo(@collection, 'add', @add_model)
@@ -39,23 +42,33 @@ class classes.SelectView extends Backbone.View
     @collection = new Backbone.Collection(_.map(values, (v) ->
       return {"label": v}
     ))
-    @collection.comparator = "label"
-    @collection.sort()
+    @collection.comparator = "label" if @sort
+    return @collection.sort() if @sort
+    return @collection
+    
 
   add_model: (m) ->
-    @set_model_label(m)
+    @set_model_attributes(m)
     select_el = @$el.find('select').first()
-    select_el.append("<option>#{m.get('label')}</option>")
+    value = "value='" + m.get('value') + "'" if m.get('value')
+    select_el.append("<option #{value}>#{m.get('label')}</option>")
 
     sort_by_name = (a, b) ->
       a.innerHTML.toLowerCase().localeCompare(b.innerHTML.toLowerCase())
 
-    options = select_el.children().get().sort(sort_by_name)
+    options = select_el.children().get()
+    options = options.sort(sort_by_name) if @sort
     for opt in options
       select_el.append(opt)
 
-  set_model_label: (model) =>
+  set_model_attributes: (model) =>
     model.set('label',model.get(@label))
+    model.set('value',model.get(@value)) if @value
+    if @default and @value and @default is model.get(@value)
+      model.set('selected',true) 
+    else if @default and !@value and @default is model.get(@label)
+      model.set('selected',true) 
+    else
 
   bind_select: ->
     t = @
@@ -66,19 +79,27 @@ class classes.SelectView extends Backbone.View
     })
 
     @select.on('change', (v) ->
-      selected_model = t.collection.find((model) -> model.get(t.label) is v.value)
+      if t.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)
+      
       t.trigger('change', selected_model)
     )
 
   get_value: -> @select.value
   get_model: ->
     value = @select.value
-    @collection.find (model) => model.get('label') is value
+    if model.get('value')
+      @collection.find (model) => model.get('value') is value
+    else
+      @collection.find (model) => model.get('label') is value
 
   set: (value) -> @select.change(value)
 
   render: =>
-    @collection.comparator = "label"
-    @$el.html(@template({models:@collection.sort().models, helper:@helper})).addClass("select-dropdown")
+    @collection.comparator = if @value then "value" else "label"
+    models = if @sort then @collection.sort().models else @collection.models
+    @$el.html(@template({models:models, helper:@helper})).addClass("select-dropdown")
     @trigger('rendered') if !@rendered
-    @
+

data/lib/atlas_assets/version.rb

@@ -1,5 +1,5 @@
 module Atlas
 	module Assets
-		VERSION = "0.8.7"
+		VERSION = "0.8.8"
 	end
 end

metadata

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