atlas_assets 0.8.6 → 0.8.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzE4ZDZmMjUxYmI5YWExYjU4YWM3ODQ5ZjAwODFkY2RmNTk0MmVkMw==
+    OGFjOTQ1ZTMwMDZmZDI3NjE2N2U0OWQ1MzY4ZjU3OGFhMWI1YmY4Mg==
   data.tar.gz: !binary |-
-    ZDEzMTE1MDgxYTNlNmQ2MzYyOWIxZjA0ZmVhN2M0OTRmZDU4ODg5Yg==
+    NjU4NDhmMDMyOTBlZmQ2ZTZmNTk3OGRmMGNlYmI0ZTllMGE4ZjhiYw==
 SHA512:
   metadata.gz: !binary |-
-    ZGRhZWZiMzlkOWExOTdkOTI0ZDUyNjVhMzg3Yzk1Zjc1MDMzY2E4YTczYzhk
-    YTdmYjIwNzk0ZTcyZGNiNGJkZDA4MWU3NjE4MjIyZTZkOTE2ZGE5NDNmNTMz
-    M2M4OWE0M2Q3NjE2ZGQ4ZGFmN2NlMmY2OTYzMzYxNzdlOTFkMGM=
+    MjFjNzc0ZGViZmE1OWMzNDJhYjcwMDVhMzc1MmEwNzRhZTgwMzVkZjIyMDc1
+    MTQ1Y2VmM2VhNzIyY2I1ZDFhYzhkMjE3ZGMyNzAwYTYyM2YwYTM0ZTViMGVk
+    Y2NmNWQ2ZTJjMWNmNjVkMzk0YjQxMjVhNjgyMTlkOTkxODU5YmM=
   data.tar.gz: !binary |-
-    ZDY3ZTc0YTRjN2I3NmRiOGMzNzMyMzI2YWI2NmNmOWE5MmVmYTQwYmMxMTg5
-    OTFhMTZhZTk1YTY1ZTZkZDBlNTU2ZDU4Y2E4OTMxOTQ1NTZmOGI1ZjQ3NjAw
-    YjJmYjRjZmViYjE1OWEzMmM2OWJhY2FhMGYxYmI5N2EwY2RmNWQ=
+    NTI1NGI3OGEzM2VkMDlhYTlhNTg3OGU0MDZjM2U3MzE2MWI4MmQ0NzcyMjU0
+    MzcyNTg2MDIwMTQ2YjRhNWZlZWFlNjlhYjk5OGU4OGRmNjI4YTgyODY3NDI2
+    NjdiMTk1NjkwMmM4MzI5YzMwNDFkYmNiNjZjNzQyMWE0MmZjMTc=

data/Gemfile

@@ -5,14 +5,14 @@ ruby '1.9.3'
 gemspec
 
 gem "rake", "~> 10.0.4"
-gem "jekyll", "~> 1.0.2"
+gem "jekyll", "~> 2.0"
 gem "sass", "~> 3.2.9"
-gem 'jekyll-assets', :git => "git://github.com/ixti/jekyll-assets.git"
+gem 'jekyll-assets'
 gem 'coffee-script'
 gem 'rack-contrib', "~> 1.1.0"
 gem "rack-rewrite", "~> 1.3.3"
 gem "pygmentize", "~> 0.0.3"
-gem "kramdown", "~> 1.0.2"
+gem "kramdown", "~> 1.3"
 gem "coderay", "~> 1.0.9"
 gem "puma", "~> 2.0.1"
 gem "eco"

data/Gemfile.lock

@@ -1,34 +1,23 @@
-GIT
-  remote: git://github.com/ixti/jekyll-assets.git
-  revision: 62d828f2648d632970e7e8a5d6884861204d63e5
-  specs:
-    jekyll-assets (0.9.2)
-      jekyll (>= 1.0.0, < 3.0.0)
-      sass (~> 3.2)
-      sprockets (~> 2.10)
-      sprockets-helpers
-      sprockets-sass
-
 PATH
   remote: .
   specs:
-    atlas_assets (0.8.5)
+    atlas_assets (0.8.7)
       handlebars_assets (~> 0.15)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    classifier (1.3.4)
-      fast-stemmer (>= 1.0.0)
+    blankslate (2.1.2.4)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.1)
+      fast-stemmer (~> 1.0)
     coderay (1.0.9)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.8.0)
     colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
-    directory_watcher (1.4.1)
     eco (1.0.0)
       coffee-script
       eco-source
@@ -36,32 +25,58 @@ GEM
     eco-source (1.1.0.rc.1)
     execjs (2.2.1)
     fast-stemmer (1.0.2)
-    handlebars_assets (0.17.1)
+    ffi (1.9.5)
+    handlebars_assets (0.18)
       execjs (>= 1.2.9)
       multi_json
       sprockets (>= 2.0.3)
       tilt
-    highline (1.6.21)
     hike (1.2.3)
-    jekyll (1.0.4)
-      classifier (~> 1.3)
+    hitimes (1.2.2)
+    jekyll (2.4.0)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      directory_watcher (~> 1.4.1)
-      kramdown (~> 1.0.2)
-      liquid (~> 2.5.1)
-      maruku (~> 0.5)
-      pygments.rb (~> 0.5.0)
-      safe_yaml (~> 0.7.0)
-    kramdown (1.0.2)
-    liquid (2.5.5)
-    maruku (0.7.2)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-assets (0.10.0)
+      jekyll (~> 2.0)
+      sass (~> 3.2)
+      sprockets (~> 2.10)
+      sprockets-helpers
+      sprockets-sass
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-paginate (1.0.0)
+    jekyll-sass-converter (1.2.1)
+      sass (~> 3.2)
+    jekyll-watch (1.1.1)
+      listen (~> 2.7)
+    kramdown (1.4.2)
+    liquid (2.6.1)
+    listen (2.7.11)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    mercenary (0.3.4)
     multi_json (1.10.1)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
     posix-spawn (0.3.9)
     puma (2.0.1)
       rack (>= 1.1, < 2.0)
     pygmentize (0.0.3)
-    pygments.rb (0.5.4)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
@@ -69,9 +84,13 @@ GEM
       rack (>= 0.9.1)
     rack-rewrite (1.3.3)
     rake (10.0.4)
-    safe_yaml (0.7.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    redcarpet (3.1.2)
+    safe_yaml (1.0.4)
     sass (3.2.19)
-    sprockets (2.12.1)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -82,6 +101,10 @@ GEM
       sprockets (~> 2.0)
       tilt (~> 1.1)
     tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
+    toml (0.1.1)
+      parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -92,9 +115,9 @@ DEPENDENCIES
   coderay (~> 1.0.9)
   coffee-script
   eco
-  jekyll (~> 1.0.2)
-  jekyll-assets!
-  kramdown (~> 1.0.2)
+  jekyll (~> 2.0)
+  jekyll-assets
+  kramdown (~> 1.3)
   puma (~> 2.0.1)
   pygmentize (~> 0.0.3)
   rack-contrib (~> 1.1.0)

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

@@ -11,7 +11,7 @@ The Dropdown is a site wide BackboneView helper using the [Chosen](http://harves
 
 ## Basic Example
 
-<div class="pull-left" id="dropdown-example-1"></div><div class="pull-left"><a class='btn'>Build Settings</a></div><div style="clear:both">&nbsp;</div>
+<div class="pull-left" id="dropdown-example-1"></div><div class="pull-left"></div><div style="clear:both">&nbsp;</div>
 
 ~~~javascript
 var dropdown = new classes.DropdownView();
@@ -23,51 +23,82 @@ dropdown.add({model: new classes.Dropdown({'label':'third'})})
 $('#dropdown-example-1').append(dropdown.render().el)
 ~~~
 
-## Setting `label` Attribute
+## Setting `label` and `value`
 
 <div id="dropdown-example-2"></div>
 ~~~javascript
 // Set the label from a different atribute, and choose a default value
-var dropdown2 = new classes.DropdownView({'label':'title', 'default_to':'third'});
+var dropdown2 = new classes.DropdownView();
 
-dropdown2.add({model: new classes.Dropdown({'title':'first'})})
-dropdown2.add({model: new classes.Dropdown({'title':'second'})})
-dropdown2.add({model: new classes.Dropdown({'title':'third'})})
+dropdown2.add({model: new classes.Dropdown({'value':'1', 'label':'first'})})
+dropdown2.add({model: new classes.Dropdown({'value':'2', 'label':'second'})})
+dropdown2.add({model: new classes.Dropdown({'value':'3', 'label':'third'})})
 
 $('#dropdown-example-2').append(dropdown2.render().el)
 ~~~
 
-## Helper Text and Setting the Width of the Dropdown
+## Setting custom `label` Attribute
+
 <div id="dropdown-example-3"></div>
+~~~javascript
+// Set the label from a different atribute, and choose a default value
+var dropdown3 = new classes.DropdownView({'label':'title', 'default_to':'third'});
+
+dropdown3.add({model: new classes.Dropdown({'title':'first'})})
+dropdown3.add({model: new classes.Dropdown({'title':'second'})})
+dropdown3.add({model: new classes.Dropdown({'title':'third'})})
+
+$('#dropdown-example-3').append(dropdown3.render().el)
+~~~
+
+## Helper Text and Setting the Width of the Dropdown
+<div id="dropdown-example-4"></div>
 
 ~~~javascript
 // Add helper texts
 // And set the width
-dropdown3 = new classes.DropdownView({'helper': 'option1', 'width':'300px'})
+dropdown4 = new classes.DropdownView({'helper': 'option1', 'width':'300px'})
 
-dropdown3.add({model: new classes.Dropdown({'label': 'this'})})
-dropdown3.add({model: new classes.Dropdown({'label': 'that'})})
+dropdown4.add({model: new classes.Dropdown({'label': 'this'})})
+dropdown4.add({model: new classes.Dropdown({'label': 'that'})})
 
-$('#dropdown-example-3').append(dropdown3.render().el)
+$('#dropdown-example-4').append(dropdown4.render().el)
 ~~~
 
 ## Multiple Selections
 
-<div id="dropdown-example-4"></div>
+<div id="dropdown-example-5"></div>
 
 ~~~javascript
 // Helper Text and Multiple Selection
-dropdown4 = new classes.DropdownView({'multiple':true, 'width':'300px'})
-dropdown4.add({model: new classes.Dropdown({'label': 'the other'})})
-dropdown4.add({model: new classes.Dropdown({'label': 'that other'})})
-dropdown4.add({model: new classes.Dropdown({'label': '1'})})
-dropdown4.add({model: new classes.Dropdown({'label': '2'})})
-dropdown4.add({model: new classes.Dropdown({'label': '3'})})
-dropdown4.add({model: new classes.Dropdown({'label': '4'})})
-dropdown4.add({model: new classes.Dropdown({'label': '5'})})
-$('#dropdown-example-4').append(dropdown4.render().el)
+dropdown5 = new classes.DropdownView({'multiple':true, 'width':'300px'})
+dropdown5.add({model: new classes.Dropdown({'label': 'the other'})})
+dropdown5.add({model: new classes.Dropdown({'label': 'that other'})})
+dropdown5.add({model: new classes.Dropdown({'label': '1'})})
+dropdown5.add({model: new classes.Dropdown({'label': '2'})})
+dropdown5.add({model: new classes.Dropdown({'label': '3'})})
+dropdown5.add({model: new classes.Dropdown({'label': '4'})})
+dropdown5.add({model: new classes.Dropdown({'label': '5'})})
+$('#dropdown-example-5').append(dropdown5.render().el)
+~~~
+
+
+## Custom values different from labels, defaulting to a value or label
+
+<div id="dropdown-example-6"></div>
+
+~~~javascript
+// Helper Text and Multiple Selection
+dropdown6 = new classes.DropdownView({ 'default_to': 2 })
+dropdown6.add({model: new classes.Dropdown({'label': 'One', 'value':'1'})})
+dropdown6.add({model: new classes.Dropdown({'label': 'Two', 'value':'2'})})
+dropdown6.add({model: new classes.Dropdown({'label': 'Three', 'value':'3'})})
+dropdown6.add({model: new classes.Dropdown({'label': 'Four', 'value':'4'})})
+dropdown6.add({model: new classes.Dropdown({'label': 'Five', 'value':'5'})})
+$('#dropdown-example-6').append(dropdown6.render().el)
 ~~~
 
+
 ### Available Options
 
 - `allow_single_deselect`
@@ -92,33 +123,57 @@ $(function () {
 
   $('#dropdown-example-1').append(dropdown.render().el)
 
-  // Set the label from a different atribute, and choose a default value
-  window.dropdown2 = new classes.DropdownView({'label':'title', 'default_to':'third'});
+  // Setting `label` and `value`
 
-  dropdown2.add({model: new classes.Dropdown({'title':'first'})})
-  dropdown2.add({model: new classes.Dropdown({'title':'second'})})
-  dropdown2.add({model: new classes.Dropdown({'title':'third'})})
+  var dropdown2 = new classes.DropdownView();
+
+  dropdown2.add({model: new classes.Dropdown({'value':'1', 'label':'first'})})
+  dropdown2.add({model: new classes.Dropdown({'value':'2', 'label':'second'})})
+  dropdown2.add({model: new classes.Dropdown({'value':'3', 'label':'third'})})
 
   $('#dropdown-example-2').append(dropdown2.render().el)
 
+
+  // Set the label from a different atribute, and choose a default value
+  window.dropdown3 = new classes.DropdownView({'label':'title', 'default_to':'third'});
+
+  dropdown3.add({model: new classes.Dropdown({'title':'first'})})
+  dropdown3.add({model: new classes.Dropdown({'title':'second'})})
+  dropdown3.add({model: new classes.Dropdown({'title':'third'})})
+
+  $('#dropdown-example-3').append(dropdown3.render().el)
+
   // Add helper texts
   // And set the width
-  dropdown3 = new classes.DropdownView({'helper': 'option1', 'width':'300px'})
+  dropdown4 = new classes.DropdownView({'helper': 'option1', 'width':'400px'})
 
-  dropdown3.add({model: new classes.Dropdown({'label': 'this'})})
-  dropdown3.add({model: new classes.Dropdown({'label': 'that'})})
+  dropdown4.add({model: new classes.Dropdown({'label': 'this'})})
+  dropdown4.add({model: new classes.Dropdown({'label': 'that'})})
 
-  $('#dropdown-example-3').append(dropdown3.render().el)
+  $('#dropdown-example-4').append(dropdown4.render().el)
 
   // Helper Text and Multiple Selection
-  dropdown4 = new classes.DropdownView({'multiple':true, 'width':'300px'})
-  dropdown4.add({model: new classes.Dropdown({'label': 'the other'})})
-  dropdown4.add({model: new classes.Dropdown({'label': 'that other'})})
-  dropdown4.add({model: new classes.Dropdown({'label': '1'})})
-  dropdown4.add({model: new classes.Dropdown({'label': '2'})})
-  dropdown4.add({model: new classes.Dropdown({'label': '3'})})
-  dropdown4.add({model: new classes.Dropdown({'label': '4'})})
-  dropdown4.add({model: new classes.Dropdown({'label': '5'})})
-  $('#dropdown-example-4').append(dropdown4.render().el)
+  dropdown5 = new classes.DropdownView({'multiple':true, 'width':'300px'})
+  dropdown5.add({model: new classes.Dropdown({'label': 'the other'})})
+  dropdown5.add({model: new classes.Dropdown({'label': 'that other'})})
+  dropdown5.add({model: new classes.Dropdown({'label': '1'})})
+  dropdown5.add({model: new classes.Dropdown({'label': '2'})})
+  dropdown5.add({model: new classes.Dropdown({'label': '3'})})
+  dropdown5.add({model: new classes.Dropdown({'label': '4'})})
+  dropdown5.add({model: new classes.Dropdown({'label': '5'})})
+  $('#dropdown-example-5').append(dropdown5.render().el)
+
+  // Custom values different from labels, defaulting to a value or label
+  dropdown6 = new classes.DropdownView({ 'default_to': 2 })
+  dropdown6.add({model: new classes.Dropdown({'label': 'One', 'value':'1'})})
+  dropdown6.add({model: new classes.Dropdown({'label': 'Two', 'value':'2'})})
+  dropdown6.add({model: new classes.Dropdown({'label': 'Three', 'value':'3'})})
+  dropdown6.add({model: new classes.Dropdown({'label': 'Four', 'value':'4'})})
+  dropdown6.add({model: new classes.Dropdown({'label': 'Five', 'value':'5'})})
+  $('#dropdown-example-6').append(dropdown6.render().el)
+
 })
+
+
+
 </script>

data/lib/assets/javascripts/models/dropdown.coffee

@@ -3,4 +3,6 @@ classes.Dropdown = Backbone.Model.extend
     @
 
   setLabel: (label) ->
-    @set('label',@get(label))
+    @set('label', @get(label))
+  setValue: (value) ->
+    @set('value', @get(value))

data/lib/assets/javascripts/templates/dropdown.hbs

@@ -4,7 +4,7 @@
 {{/if}}
 <select class="dropdown-list" {{#if multiple}}multiple{{/if}} {{#if placeholder}}data-placeholder='{{placeholder}}'{{/if}}>
   {{#each models}}
-  <option {{#if selected}}selected{{/if}} {{#if disabled}}disabled{{/if}}>{{label}}</option>
+  <option {{#if value}}value="{{value}}"{{/if}} {{#if selected}}selected{{/if}} {{#if disabled}}disabled{{/if}}>{{label}}</option>
   {{/each}}
 </select>
 {{#if helper}}

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

@@ -13,10 +13,12 @@ classes.DropdownView = Backbone.View.extend
       @set_default(model)
 
   set_default: (model) ->
-    model.set('selected', 'selected') if model.get('label') is @opts.default_to
+    if model.get('value') is "#{@opts.default_to}" or  model.get('label') is "#{@opts.default_to}"
+      model.set('selected', 'selected')
 
   add: (params) ->
     model = params.model
+    model.set 'value', model.get(@opts.value || 'value') || model.get(@opts.label || 'label')
     model.set 'label', model.get(@opts.label || 'label')
     @collection.add(model)
     @set_default(model)
@@ -29,7 +31,7 @@ classes.DropdownView = Backbone.View.extend
     this.delegateEvents();
     @$('.dropdown-list').chosen({width: @opts.width, disable_search_threshold: @opts.disable_search_threshold}).change((e,selected) =>
       model = @collection.find (m) ->
-        selected.selected is m.get('label')
+        selected.selected is m.get('value')
       this.trigger(app.events.SELECT, model)
     )
     @
@@ -43,4 +45,4 @@ classes.DropdownView = Backbone.View.extend
     @render().el
 
   get_selected: () ->
-    @collection.find (model) => @$('select').val() is model.get('label')
+    @collection.find (model) => @$('select').val() is model.get('value')

data/lib/assets/stylesheets/atlas_assets/_chosen.scss

@@ -135,7 +135,7 @@
   overflow-y: auto;
   margin: 0 4px 4px 0;
   padding: 0 0 0 4px;
-  max-height: 240px;
+  max-height: 394px;
   -webkit-overflow-scrolling: touch;
 }
 .chosen-container .chosen-results li {

data/lib/atlas_assets/version.rb

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

metadata

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