droom 0.4.3 → 0.5.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ab8c3b83c6c232deae0ed212165e12a1b6045c17
+  data.tar.gz: 7bae079f2bbbdddf60255ca2a5662bfd1393598b
+SHA512:
+  metadata.gz: b826b37d88e760021fa63381293353accc25414fe69bd1dd0519aba893280720b0e888eaab2cd68c2a0108e17b5dc05c2eef49df52c5629c2097d715574e4e0e
+  data.tar.gz: c002819dadb74bfbe2d31e9b327bc732175295ab7aff97fdd22b4574de89c66265aac271b2cba67778037dc96c6522c137f9a2c02ba1f8ea39b9565215d814c9

data/app/assets/javascripts/droom.js.coffee

@@ -1,11 +1,14 @@
 #= require droom/lib/modernizr
 #= require jquery
-#= require jquery_ujs
+#= require droom/lib/underscore
+#= require droom/lib/jquery_ujs
 #= require droom/lib/ZeroClipboard
+#= require droom/lib/swipe
 #= require droom/lib/jquery.animate-colors
+#= require droom/lib/jquery.deserialize
 #= require droom/lib/jquery.sortable
 #= require droom/lib/jquery.cookie
-#= require droom/lib/kalendae
+#= require droom/lib/jquery.datepicker
 #= require droom/lib/wysihtml5
 #= require droom/lib/parser_rules/advanced
 #= require droom/extensions
@@ -16,12 +19,10 @@
 #= require droom/widgets
 #= require droom/stream
 #= require droom/map
-#= require cropper
 #= require_self
 
 jQuery ($) ->
   $.activate_with () ->
-    # console.log "activate", @
     
     @find_including_self('#flashes p:parent').flash()
     @find_including_self('[data-refreshable]').refresher()
@@ -35,8 +36,10 @@ jQuery ($) ->
     @find_including_self('[data-action="affect"]').affects()
     @find_including_self('[data-action="reveal"]').reveals()
     @find_including_self('[data-action="remove"]').removes()
+    @find_including_self('[data-action="remove_all"]').removes_all()
     @find_including_self('[data-action="copy"]').copier()
     @find_including_self('[data-action="column_toggle"]').column_expander()
+    @find_including_self('[data-action="setter"]').setter()
     @find_including_self('[data-action="toggle"]').toggle()
     @find_including_self('[data-action="twister"]').twister()
     @find_including_self('[data-action="alternate"]').alternator()
@@ -45,33 +48,36 @@ jQuery ($) ->
     @find_including_self('[data-action="slide"]').sliding_link()
     @find_including_self('[data-action="fit"]').self_sizes()
     @find_including_self('form[data-action="filter"]').filter_form()
+    @find_including_self('form[data-action="table_filter"]').table_filter_form()
+    @find_including_self('div[data-panel]').panel()
     @find_including_self('[data-menu]').action_menu()
-    @find_including_self('td[data-hoverable]').hover_column()
+    @find_including_self('table[data-hoverable]').hover_table()
     
     # it's not very easy to add data attributes to kaminari pagination links
     
-    @find_including_self('.pagination a').page_turner()
+    @find_including_self('.pagination.sliding a').page_turner()
 
     # and some shortcuts for compatibility
     
     @find_including_self('a.inline, a.fetch').replace_with_remote_content()
     
-    # form widgets and input modification. These might move to [data-widget] markup.
+    # form widgets and input modification. These are moving to [data-role] markup.
     
     @find_including_self('.wysihtml').html_editable()
-    @find_including_self('.venuepicker').venue_picker()
-    @find_including_self('.datepicker').date_picker()
+    @find_including_self('[data-role="datepicker"]').date_picker()
     @find_including_self('.timepicker').time_picker()
-    @find_including_self('.filepicker').file_picker()
     @find_including_self('.person_selector').person_selector()
     @find_including_self('.person_picker').person_picker()
     @find_including_self('.group_picker').group_picker()
     @find_including_self('.drag_sort').drag_sort()
-    # @find_including_self('input.password').password_field()
     @find_including_self('form.password').password_form()
     @find_including_self('input[type="submit"]').submitter()
-    @find_including_self('form.preferences').preferences_form()
     @find_including_self('form.scrap').scrap_form()
+    @find_including_self('[data-role="filepicker"]').file_picker()
+    @find_including_self('[data-role="imagepicker"]').image_picker()
+    @find_including_self('[data-role="youtubepicker"]').youtube_suggester()
+    @find_including_self('[data-role="venuepicker"]').venue_picker()
+    @find_including_self('[data-role="slug"]').slug_field()
     
     # page widgets
     
@@ -81,5 +87,9 @@ jQuery ($) ->
     @find_including_self('form.fancy').captive()
     @find_including_self('li.folder').folder()
     @find_including_self('form#suggestions').suggestion_form()
-    @find_including_self('.panel').panel()
+
+    # stream slides
+
+    @find_including_self('.scrap.preload').add_to_stream()
+    
     @

data/app/assets/javascripts/droom/actions.js.coffee

@@ -19,7 +19,7 @@
 # will replace the original event container and the small calendar display will be refreshed to show the possibly revised
 # date of the event.
 #
-# It is our hope that this simple non-architecture will make it easy to support a future pub-sub update.
+# With any luck this simple non-architecture will make it easy to support a future pub-sub update.
 
 jQuery ($) ->
 
@@ -27,10 +27,13 @@ jQuery ($) ->
   #
   # refreshable, affected rules, etc.
 
-  $.fn.refresher = () ->
+  $.fn.refresher = ->
     @each ->
       new Refresher @
 
+  $.fn.refresh = ->
+    @trigger('refresh')
+
   class Refresher
     constructor: (element) ->
       @_container = $(element)
@@ -42,15 +45,22 @@ jQuery ($) ->
       e.preventDefault()
       $.ajax @_url,
         dataType: "html"
+        beforeSend: @prep
         success: @replace
     
+    prep: (xhr, settings) =>
+      xhr.setRequestHeader('X-PJAX', 'true')
+      @_container.addClass('waiting')
+      true
+
     replace: (data, textStatus, jqXHR) =>
       replacement = $(data)
       @_container.fadeOut 'fast', () =>
         replacement.hide().insertAfter(@_container)
         @_container.remove()
         @_container = replacement
-        @_container.activate().fadeIn('fast')
+        @_container.activate().fadeIn 'fast', () =>
+          @_container.signal_confirmation()
       
 
   # ## Actions
@@ -76,6 +86,23 @@ jQuery ($) ->
             $(@).remove()
             $(affected).trigger "refresh"
 
+  # The 'remove_all' action takes out on success anything matching the given selector:
+  #
+  #   link_to t(:remove), service_url(service), :method => 'delete', :data => { :removes => "s_#{service.id}" }
+  #
+  # ...on success takes out every DOM element with the class "s_1".
+  #
+  $.fn.removes_all = () ->
+    @each ->
+      removed = $(@).attr('data-removed')
+      affected = $(@).attr('data-affected')
+      
+      $(@).remote
+        on_success: (response) =>
+          $(removed).fadeOut 'fast', () ->
+            $(@).remove()
+            $(affected).trigger "refresh"
+
 
   $.fn.affects = () ->
     @each ->
@@ -104,14 +131,15 @@ jQuery ($) ->
     @each ->
       container = $(@).attr('data-replaced') || selector
       affected = $(@).attr('data-affected')
+      autoload = options['force'] || ($(@).attr('data-autoload')? && $(@).attr('data-autoload') isnt 'false')
       $(@).remote
-        on_success: (r) =>
+        on_success: (e, r) =>
           replaced = $(@).self_or_ancestor(container).last()
           replacement = $(r).insertAfter(replaced)
           replaced?.remove()
           replacement.activate()
           $(affected).trigger('refresh')
-      $(@).click() if options['force']
+      $(@).click() if autoload
 
 
 
@@ -126,6 +154,68 @@ jQuery ($) ->
           e.preventDefault() if e
 
 
+
+
+
+  # The setter action sets a single boolean object property by putting a single parameter to the link href.
+  # :property and :url data- attributes are required. True/false state is signalled by yes/no css class that
+  # presumably also affects apperance.
+  #
+  # As usual success can trigger the refreshment of other elements selected by the data-affected attribute.
+  #
+  #   %a{:data => {:action => 'setter', :property => 'featured', url: "/api/threads/27/posts/32"}}
+  #
+  # will toggle on and off the 'featured' property of the resource at that address.
+  #
+  $.fn.setter = () ->
+    @each ->
+      new Setter(@)
+  
+  class Setter
+    constructor: (element, @_root, @_property) ->
+      @_link = $(element)
+      @_root ?= @_link.attr('data-object')
+      @_property ?= @_link.attr('data-property')
+      @_positive = @_link.attr('data-positive') ? true
+      @_negative = @_link.attr('data-negative') ? false
+      @_affected = @_link.attr('data-affected')
+      @_link.bind "click", @toggle
+
+    data: (e) =>
+      data = {}
+      value = if @_link.hasClass('yes') then @_negative else @_positive
+      data[@_root] = {}
+      data[@_root][@_property] = value 
+      data['_method'] = "PUT"
+      data
+
+    toggle: (e) =>
+      e.preventDefault() if e
+      value = !@_link.hasClass('yes')
+      data = {}
+      @_link.addClass('waiting')
+      $.ajax
+        url: @_link.attr('href')
+        type: "POST"
+        data: @data()
+        success: @update
+        error: @error
+
+    error: (xhr, status, error) =>
+      @_link.removeClass('waiting').signal_error()
+
+    update: (response) =>
+      @_link.removeClass('waiting')
+      if response[@_property]
+        @_link.addClass('yes').removeClass('no')
+      else
+        @_link.addClass('no').removeClass('yes')
+      $(@_affected).refresh()
+      
+
+
+
+
   # The toggle action shows or hides the affected elements with cookie-based persistence across page
   # views. A link like this:
   #
@@ -193,7 +283,7 @@ jQuery ($) ->
            path: '/'
 
 
-  # The collapser is a self-expanding unit. Basically a toggle. #todo: amalgamate!
+  # The collapser is a self-expanding unit. Basically, a toggle. #todo: amalgamate!
 
   $.fn.collapser = (options) ->
     @each ->
@@ -341,13 +431,17 @@ jQuery ($) ->
 
 
 
-  $.fn.hover_column = ->
+  $.fn.hover_table = ->
+    @each ->
+      $(@).find('td').hover_cell()
+    
+  $.fn.hover_cell = ->
     @each ->
       classes = @className.split(' ').join('.')
       $(@).bind "mouseenter", (e) ->
-        $("td.#{classes}").addClass('hover')
+        $(".#{classes}").addClass('hover')
       $(@).bind "mouseleave", (e) ->
-        $("td.#{classes}").removeClass('hover')
+        $(".#{classes}").removeClass('hover')
 
 
 
@@ -429,7 +523,7 @@ jQuery ($) ->
           index = child.index() + offset
           id = parseInt(child.attr('id').split("person_")[1], 10)
           $.ajax
-            url: "/people/#{id}"
+            url: "/users/#{id}"
             type: "PUT"
             dataType: "JSON"
             data:

data/app/assets/javascripts/droom/ajax.js.coffee

@@ -1,21 +1,12 @@
 ## Ajax transport
 #
-# We extend the standard rails jquery-ujs method with a standard response and failure handler. All our
-# remote operations are channelled through this class and use callbacks to affect the page during and 
-# after the request.
+# This is a wrapper around the standard jquer ujs ajax machinery. it gives us a more fine-grained set of callbacks
+# and a central place to do some universal work like setting pjax headers and telling elements to wait.
 #
-# This isn't very clever or complicated but it gives us a standard channel that handles requests in a 
-# consistent way. It applies a PJAX header and defines a simple callback interface that makes the rest 
-# of our code more readable. In most cases it also allows us to omit the [data-remote] and [data-type] 
-# attributes from links.
+# The value of the remote: calls becomes more clear when we need to add more callbacks, eg from a widget like the 
+# filepicker, but perhaps they can disappear now that we've hacked up the ujs a bit.
 #
-# ### Callbacks
-#
-# * *on_prepare* is called when the remote control is first created. No arguments.
-# * *on_request* is called before the remote call. Arguments: [xhr]
-# * *on_error* is called if the server returns an error. Arguments: [xhr]
-# * *on_success* is called if the request is successful. Arguments: [response]
-# * *on_complete* is called after the request, whether successful or not. Arguments: [status]
+
 #
 jQuery ($) ->
 
@@ -34,47 +25,68 @@ jQuery ($) ->
       @_options = $.extend {}, opts
       @_control.attr('data-remote', true)
       @_control.attr('data-type', 'html')
+      @_fily = false
+      
+      # catch the standard jquery_ujs events and route them to our status handlers, 
       @_control.on 'ajax:beforeSend', @pend
       @_control.on 'ajax:error', @fail
       @_control.on 'ajax:success', @receive
+      @_control.on 'ajax:filedata', @gotFiles
+      @_control.on 'ajax:progress', @progress
+
+      # which trigger our own more fine-grained remote:* events
+      @_control.on 'remote:prepare', @_options.on_prepare
+      @_control.on 'remote:begin', @_options.on_request
+      @_control.on 'remote:progress', @_options.on_progress
+      @_control.on 'remote:error', @_options.on_error
+      @_control.on 'remote:success', @_options.on_success
+      @_control.on 'remote:complete', @_options.on_complete
+      @_control.on 'remote:cancel', @_options.on_cancel
       @activate()
         
     activate: () => 
       @_control.find('a.cancel').click @cancel
-      @_options.on_prepare?()
+      @_control.trigger 'remote:prepare'
 
     pend: (event, xhr, settings) =>
       event.stopPropagation()
       event.preventDefault()
       xhr.setRequestHeader('X-PJAX', 'true')
       @_control.addClass('waiting')
-      @_options.on_request?(xhr)
+      @_control.trigger 'remote:begin', xhr, settings
+      true
 
+    gotFiles: (event, elements) =>
+      @_control.trigger 'remote:upload'
+      true
+
+    progress: (e, prog) =>
+      @_control.trigger "remote:progress", prog
+    
     fail: (event, xhr, status) =>
       event.stopPropagation()
       @_control.removeClass('waiting').addClass('erratic')
-      @_options.on_error?(xhr)
-      @_options.on_complete?(status)
-  
+      @_control.trigger 'remote:error', xhr
+      @_control.trigger 'remote:complete', status
+
     # Note that there is no special provision here for a server side failure that results in a success response:
     # eg if validation fails and we get the form back again, this Remote will be considered successful and disappear.
     # In that case the function which triggered the remote operation is expected to do the right thing with the 
     # returned html. Usually in that kind of situation you'd be using a popup, which checks for a returned form and
     # treats it as another iteration within the same window.
     #
-    receive: (event, response, status) =>
+    receive: (event, data, status, xhr) =>
       event.stopPropagation()
       @_control.removeClass('waiting')
-      @_options.on_success?(response)
-      @_options.on_complete?(status)
+      @_control.trigger 'remote:success', data
+      @_control.trigger 'remote:complete', status
         
     cancel: (e) =>
       e.preventDefault() if e
-      @_options.on_cancel?()
+      @_control.trigger 'remote:cancel'
       @_form?.remove()
 
 
-