fustrate-rails 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d5f71aa31c1e5bad989dc3c933c549a5e62f1a5
-  data.tar.gz: 9a42f14c3770a006361c62eb23fa4403d0679024
+  metadata.gz: df054189ffa1878cc1b2315846a917e969a48c5b
+  data.tar.gz: 2f958a0fa3e5e527a30e4550ca5263b7ba19c722
 SHA512:
-  metadata.gz: 91bf081fd1025eeea96885535db9b86837cb05d9f6f702d9c1c16b49f33c6a6765f25ae9188eb48af9f34d60b4451461d0da6a97c0fc2d264c5054360a3c5380
-  data.tar.gz: 97193c0ca4c61d7b5fed80b4f98d6eea38a961a8799ebafa4d04a9cb5910de93dc96f5822c4b391f93474d4068b656363b2c64f59d6283dd3b9a9879c6153254
+  metadata.gz: 2277809e67752f86598ae25edf26f0fc57158cc9a05d9d8fb12f65d1d2f1fab32b8e0476fd23840eae8396a9e986231228550437b4ac7d109f4e9872535fa3e9
+  data.tar.gz: 5262aaf6879f964a5f508105680921f4f273cf3838685225a5331509901c923136de021b35d3ea550cdbf23be82abb3d3f05bf1c3e3743b134ae9d4514202778

data/lib/fustrate/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Fustrate
   module Rails
-    VERSION = '0.3.3'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/vendor/assets/javascripts/fustrate/_module.coffee

@@ -3,7 +3,7 @@
 #= require_tree .
 
 class window.Fustrate
-  @VERSION: '0.3.3'
+  @VERSION: '0.4.0'
   @libs: {}
 
   constructor: ->
@@ -15,6 +15,9 @@ class window.Fustrate
     @initialize()
 
   initialize: ->
+    # Loop through every element on the page with a data-js-class attribute
+    # and convert the data attribute's value to a real object. Then instantiate
+    # a new object of that class.
     $('[data-js-class]').each (index, elem) ->
       element = $(elem)
       klass = Fustrate._stringToClass element.data('js-class')
@@ -30,24 +33,26 @@ class window.Fustrate
     $('.number').each (index, elem) ->
       elem = $ @
 
-      number = if elem.data('number') != undefined
+      number = if elem.data('number') isnt undefined
         elem.data('number')
       else
         elem.html()
 
       elem.addClass 'negative' if parseInt(number, 10) < 0
 
+  # Take a string like 'Asgard.Whiteboard.Entry' and retrieve the real class
+  # with that name. Start at `window` and work down from there.
   @_stringToClass: (string) ->
     pieces = string.split('.')
 
     Fustrate._arrayToClass(pieces, window)
 
   @_arrayToClass: (pieces, root) ->
-    if pieces.length == 1
-      root[pieces[0]]
-    else
-      Fustrate._arrayToClass pieces.slice(1), root[pieces[0]]
+    return root[pieces[0]] if pieces.length is 1
+
+    Fustrate._arrayToClass pieces.slice(1), root[pieces[0]]
 
+  # Very similar to the Rails helper `link_to`. Returns an HTML string.
   @linkTo: (text, path, options = {}) ->
     $('<a>').prop('href', path).html(text).prop(options).outerHTML()
 
@@ -67,13 +72,13 @@ class window.Fustrate
         $.rails.CSRFProtection xhr
 
   @humanDate: (date, time = false) ->
-    if date.year() == moment().year()
+    if date.year() is moment().year()
       date.format("M/D#{if time then ' h:mm A' else ''}")
     else
       date.format("M/D/YY#{if time then ' h:mm A' else ''}")
 
   @label: (text, type) ->
-    type = if type then "#{type} " else ""
+    type = if type then "#{type} " else ''
 
     $('<span>')
       .text(text)
@@ -84,6 +89,7 @@ class window.Fustrate
 
     "<i class=\"fa #{classes}\"></i>"
 
+# Replicate a few common prototype methods on String and Array
 String::titleize = ->
   @replace(/_/g, ' ').replace /\b[a-z]/g, (char) -> char.toUpperCase()
 

data/vendor/assets/javascripts/fustrate/components/autocomplete.coffee

@@ -43,7 +43,7 @@ class Fustrate.Components.Autocomplete extends Fustrate.Components.Base
       .on 'focus', @onFocus
 
   blanked: =>
-    return unless @input.val().trim() == ''
+    return unless @input.val().trim() is ''
 
     @awesomplete.close()
 
@@ -90,17 +90,17 @@ class Fustrate.Components.Autocomplete extends Fustrate.Components.Base
     false
 
   onKeyup: (e) =>
-    keyCode = e.which || e.keyCode
+    keyCode = e.which or e.keyCode
 
     value = @input.val().trim()
 
-    return @blanked() if value == ''
+    return @blanked() if value is ''
 
     # Ignore: Tab, Enter, Esc, Left, Up, Right, Down
     return if keyCode in [9, 13, 27, 37, 38, 39, 40]
 
     # Don't perform the same search twice in a row
-    return unless value != @value && value.length >= 2
+    return unless value isnt @value and value.length >= 2
 
     @value = value
     @items = []

data/vendor/assets/javascripts/fustrate/components/file_picker.coffee

@@ -3,6 +3,7 @@ class Fustrate.Components.FilePicker extends Fustrate.Components.Base
     input = $ '<input type="file">'
 
     input
+      .appendTo $('body')
       .change ->
         callback input[0].files
 

data/vendor/assets/javascripts/fustrate/components/flash.coffee

@@ -3,7 +3,7 @@ class Fustrate.Components.Flash extends Fustrate.Components.Base
   @fadeOutSpeed: 2000
   @displayTime: 4000
 
-  constructor: (message, {type, icon} = {}) ->
+  constructor: (message, { type, icon } = {}) ->
     message = "#{Fustrate.icon(icon)} #{message}" if icon
 
     bar = $ "<div class=\"flash #{type ? 'info'}\"></div>"
@@ -19,13 +19,13 @@ class Fustrate.Components.Flash extends Fustrate.Components.Base
     $('body').append '<div id="flashes">'
 
   class @Error
-    constructor: (message, {icon} = {}) ->
+    constructor: (message, { icon } = {}) ->
       new Fustrate.Components.Flash message, type: 'error', icon: icon
 
   class @Info
-    constructor: (message, {icon} = {}) ->
+    constructor: (message, { icon } = {}) ->
       new Fustrate.Components.Flash message, type: 'info', icon: icon
 
   class @Success
-    constructor: (message, {icon} = {}) ->
+    constructor: (message, { icon } = {}) ->
       new Fustrate.Components.Flash message, type: 'success', icon: icon

data/vendor/assets/javascripts/fustrate/components/modal.coffee

@@ -1,4 +1,10 @@
 class Fustrate.Components.Modal extends Fustrate.Components.Base
+  @size: 'tiny'
+  @type: null
+  @icon: null
+  @title: null
+  @buttons: []
+
   @fadeSpeed: 250
 
   @settings:
@@ -16,13 +22,14 @@ class Fustrate.Components.Modal extends Fustrate.Components.Base
         display: 'none'
     _cachedHeight: undefined
 
-  constructor: ({title, content, size, settings}) ->
-    @modal = @constructor.createModal size: size
+  constructor: ({ content, settings } = {}) ->
+    @modal = @constructor.createModal()
     @settings = $.extend true, @constructor.settings, (settings ? {})
     @settings.previousModal = $()
 
-    @setTitle title
-    @setContent content
+    @setTitle @constructor.title, icon: @constructor.icon
+    @setContent content, false
+    @setButtons @constructor.buttons, false
 
     @_reloadUIElements()
     @addEventListeners()
@@ -44,15 +51,64 @@ class Fustrate.Components.Modal extends Fustrate.Components.Base
       button = $ element
       @buttons[button.data('button')] = button
 
-  setTitle: (title) =>
-    $('.modal-title span', @modal).html title
+  setTitle: (title, { icon } = {}) =>
+    if icon
+      $('.modal-title span', @modal).html "#{Fustrate.icon icon} #{title}"
+    else if @constructor.icon and icon isnt false
+      $('.modal-title span', @modal)
+        .html "#{Fustrate.icon @constructor.icon} #{title}"
+    else
+      $('.modal-title span', @modal).html title
 
-  setContent: (content) =>
+  setContent: (content, reload = true) =>
     $('.modal-content', @modal).html content
 
     @settings._cachedHeight = undefined
 
-    @_reloadUIElements()
+    @_reloadUIElements() if reload
+
+  setButtons: (buttons, reload = true) =>
+    if buttons?.length < 1
+      $('.modal-buttons', @modal).empty()
+
+      return
+
+    list = []
+
+    for button in buttons
+      if typeof button is 'string'
+        list.push """
+          <button data-button="#{button}" class="#{button} expand">
+            #{button.titleize()}
+          </button>"""
+      else if typeof button is 'object'
+        for name, options of button
+          if typeof options is 'object'
+            text = options.text
+          else if typeof options is 'string'
+            text = options
+
+          text ?= name.titleize()
+
+          list.push(
+            $("<button data-button=\"#{name}\" class=\"expand\">")
+              .text(text)
+              .addClass(options.type ? name)
+              .outerHTML()
+          )
+
+    columns = list.map (button) -> "<div class=\"columns\">#{button}</div>"
+
+    $('.modal-buttons', @modal)
+      .empty()
+      .html "<div class=\"row\">#{columns.join('')}</div>"
+
+    $('.modal-buttons .row .columns', @modal)
+      .addClass("large-#{12 / columns.length}")
+
+    @settings._cachedHeight = undefined
+
+    @_reloadUIElements() if reload
 
   addEventListeners: =>
     @modal
@@ -73,13 +129,13 @@ class Fustrate.Components.Modal extends Fustrate.Components.Base
     # Focus requires a slight physical scroll on iOS 8.4
     return true if /iPad|iPhone|iPod/g.test navigator.userAgent
 
-    $('input, select', @modal)
+    $('input, select, textarea', @modal)
       .filter(':visible:not(:disabled):not([readonly])')
       .first()
       .focus()
 
   open: =>
-    return if @modal.hasClass('locked') || @modal.hasClass('open')
+    return if @modal.hasClass('locked') or @modal.hasClass('open')
 
     @modal.addClass('locked')
 
@@ -91,13 +147,13 @@ class Fustrate.Components.Modal extends Fustrate.Components.Base
     $('body')
       .off 'keyup.modal'
       .on 'keyup.modal', (e) =>
-        return if @modal.hasClass('locked') || e.which != 27
+        return if @modal.hasClass('locked') or e.which isnt 27
 
         @close()
 
     @modal.trigger 'opening.modal'
 
-    @_cacheHeight() if typeof @settings._cachedHeight == 'undefined'
+    @_cacheHeight() if typeof @settings._cachedHeight is 'undefined'
 
     if @settings.previousModal.length
       @settings.previousModal.trigger('hide.modal')
@@ -123,17 +179,17 @@ class Fustrate.Components.Modal extends Fustrate.Components.Base
     ), 125
 
   close: (openPrevious = true) =>
-    return if @modal.hasClass('locked') || !@modal.hasClass('open')
+    return if @modal.hasClass('locked') or not @modal.hasClass('open')
 
     @modal.addClass 'locked'
 
     $('body').off 'keyup.modal'
 
-    unless @settings.previousModal.length && openPrevious
+    unless @settings.previousModal.length and openPrevious
       @constructor.toggleBackground(false)
 
     end_css =
-      top: - $(window).scrollTop() - @settings._cachedHeight + 'px',
+      top: -$(window).scrollTop() - @settings._cachedHeight + 'px',
       opacity: 0
 
     setTimeout (=>
@@ -166,16 +222,20 @@ class Fustrate.Components.Modal extends Fustrate.Components.Base
 
     @modal.hide()
 
-  @createModal: ({size}) ->
+  @createModal: ->
     $("""
-      <div class="modal #{size ? 'tiny'}">
+      <div class="#{@_defaultClasses().join(' ')}">
         <div class="modal-title">
           <span></span>
           <a href="#" class="modal-close">&#215;</a>
         </div>
         <div class="modal-content"></div>
+        <div class="modal-buttons"></div>
       </div>""").appendTo(@settings.appendTo)
 
+  @_defaultClasses: ->
+    ['modal', @size, @type].filter (klass) -> klass isnt null
+
   @toggleBackground: (visible = true) =>
     @overlay = $ '<div class="modal-overlay">' unless @overlay
 
@@ -194,7 +254,7 @@ class Fustrate.Components.Modal extends Fustrate.Components.Base
   @backgroundClicked: ->
     modal = $ '.modal.open'
 
-    return if !modal || modal.hasClass('locked')
+    return if not modal or modal.hasClass('locked')
 
     # Don't continue to close if we're not supposed to
     return unless Fustrate.Components.Modal.settings.closeOnBackgroundClick
@@ -206,7 +266,7 @@ class Fustrate.Components.Modal extends Fustrate.Components.Base
   @closeButtonClicked: ->
     modal = $ '.modal.open'
 
-    return if !modal || modal.hasClass('locked')
+    return if not modal or modal.hasClass('locked')
 
     modal.trigger 'close.modal'
 

data/vendor/assets/javascripts/fustrate/components/pagination.coffee

@@ -1,5 +1,5 @@
 class Fustrate.Components.Pagination extends Fustrate.Components.Base
-  constructor: ({@current_page, @total_pages, @total_entries, @per_page}) ->
+  constructor: ({ @current_page, @total_pages, @total_entries, @per_page }) ->
     @base = @constructor._getPreppedPaginationURL()
 
   link: (text, page, options = {}) =>
@@ -28,9 +28,9 @@ class Fustrate.Components.Pagination extends Fustrate.Components.Base
 
     if @total_pages > 1
       pages = for i in @windowedPageNumbers()
-        if i == @current_page
+        if i is @current_page
           "<li class=\"current\">#{Fustrate.linkTo(i, '#')}</li>"
-        else if i == 'gap'
+        else if i is 'gap'
           '<li class="unavailable"><span class="gap">…</span></li>'
         else
           "<li>#{@link i, i}</li>"
@@ -74,9 +74,9 @@ class Fustrate.Components.Pagination extends Fustrate.Components.Base
   @_getPreppedPaginationURL: ->
     search = window.location.search.replace(/[?&]page=\d+/, '')
 
-    search = if search[0] == '?'
+    search = if search[0] is '?'
                "#{search}&"
-             else if search[0] == '&'
+             else if search[0] is '&'
                "?#{search[1...search.length]}&"
              else
                '?'

data/vendor/assets/javascripts/fustrate/generic_form.coffee

@@ -21,11 +21,10 @@ class Fustrate.GenericForm extends Fustrate.GenericPage
   validate: -> true
 
   onSubmit: (e) =>
-    e.preventDefault()
+    return true if @validate()
 
-    unless @validate()
-      setTimeout (=> $.rails.enableFormElements(@root)), 100
+    e.preventDefault()
 
-      return false
+    setTimeout (=> $.rails.enableFormElements(@root)), 100
 
-    true
+    false

data/vendor/assets/javascripts/fustrate/generic_page.coffee

@@ -14,21 +14,21 @@ class Fustrate.GenericPage
     @fields = {}
     @buttons = {}
 
-    $('[data-field]', @root).each (index, element) =>
+    $('[data-field]', @root).not('.modal [data-field]').each (i, element) =>
       field = $ element
       @fields[field.data('field')] = field
 
-    $('[data-button]', @root).each (index, element) =>
+    $('[data-button]', @root).not('.modal [data-button]').each (i, element) =>
       button = $ element
       @buttons[button.data('button')] = button
 
-  flashSuccess: (message, {icon} = {}) ->
+  flashSuccess: (message, { icon } = {}) ->
     new Fustrate.Components.Flash.Success(message, icon: icon)
 
-  flashError: (message, {icon} = {}) ->
+  flashError: (message, { icon } = {}) ->
     new Fustrate.Components.Flash.Error(message, icon: icon)
 
-  flashInfo: (message, {icon} = {}) ->
+  flashInfo: (message, { icon } = {}) ->
     new Fustrate.Components.Flash.Info(message, icon: icon)
 
   setHeader: (text) ->
@@ -37,4 +37,4 @@ class Fustrate.GenericPage
   # Calls all methods matching /refresh.+/
   refresh: =>
     for own name, func of @
-      func() if name.indexOf('refresh') == 0 && name != 'refresh'
+      func() if name.indexOf('refresh') is 0 and name isnt 'refresh'

data/vendor/assets/javascripts/fustrate/generic_table.coffee

@@ -12,7 +12,7 @@ class Fustrate.GenericTable extends Fustrate.GenericPage
   sortRows: (rows, sortFunction = ->) ->
     sorted = ([sortFunction(row), row] for row in rows)
     sorted.sort (x, y) ->
-      if x[0] == y[0] then 0 else if x[0] > y[0] then 1 else -1
+      if x[0] is y[0] then 0 else if x[0] > y[0] then 1 else -1
     sorted.map (row) -> row[1]
 
   createRow: (item) =>
@@ -21,7 +21,7 @@ class Fustrate.GenericTable extends Fustrate.GenericPage
   updateRow: (row, item) ->
     row
 
-  reloadRows: (rows, {sort} = { sort: null }) =>
+  reloadRows: (rows, { sort } = { sort: null }) =>
     tbody = $ 'tbody', @table
 
     $('tr.loading', tbody).hide()