card 1.15.1 → 1.15.2

data/mod/03_machines/lib/javascript/script_card_menu.js.coffee

@@ -0,0 +1,20 @@
+wagn.slotReady (slot) ->
+  menu = $(slot).find('.open-menu.dropdown-toggle')
+  if menu?
+    $(menu).dropdown('toggle')
+
+$(window).ready ->
+  $('body').on 'click', '.toolbar .nav-pills > li', ->
+    $(this).tab('show')
+
+  $(document).on 'tap', '.card-header', (event) ->
+    link = $(this).find('.card-menu > a')
+    unless !link[0] or                                             # no gear
+        event.pageX - $(this).offset().left < $(this).width() / 2  # left half of header
+
+      link.click()
+      event.preventDefault()
+
+  $(document).on 'tap', 'body', (event) ->
+    unless $(event.target).closest('.card-header')[0] or $(event.target).closest('.card-menu-link')[0]
+      $('.card-menu .dropdown-toggle').dropdown('toggle')

data/mod/03_machines/lib/javascript/wagn.js.coffee

@@ -13,9 +13,9 @@ $.extend wagn,
       xtra['is_main'] = true if slot.isMain()
       slotdata = slot.data 'slot'
       wagn.slotParams slotdata, xtra, 'slot' if slotdata?
-      
+
     url + ( (if url.match /\?/ then '&' else '?') + $.param(xtra) )
-  
+
   slotParams: (raw, processed, prefix)->
     $.each raw, (key, value)->
       cgiKey = prefix + '[' + snakeCase(key) + ']'
@@ -23,19 +23,29 @@ $.extend wagn,
         wagn.slotParams value, processed, cgiKey
       else
         processed[cgiKey] = value
-        
+
   slotReady: (func)->
     $('document').ready ->
       $('body').on 'slotReady', '.card-slot', (e) ->
         e.stopPropagation()
         func.call this, $(this)
   pingName: (name, success)->
-    $.getJSON wagn.rootPath + '/', { format: 'json', view: 'status', 'card[name]': name }, success  
+    $.getJSON wagn.rootPath + '/', { format: 'json', view: 'status', 'card[name]': name }, success
 
 jQuery.fn.extend {
-  slot: -> 
-    if @attr('slotSelector')
-      @closest @attr('slotSelector')
+  slot: ->
+    if @data('slot-selector')
+      target_slot = @closest(@data('slot-selector'))
+      parent_slot = @closest '.card-slot'
+
+      # if slot-selector doesn't apply to a child, search in all parent slots and finally in the body
+      while target_slot.length == 0 and parent_slot.length > 0
+        target_slot = $(parent_slot).find(@data('slot-selector'))
+        parent_slot = $(parent_slot).parent().closest '.card-slot'
+      if target_slot.length == 0
+        $('body').find(@data('slot-selector'))
+      else
+        target_slot
     else
       @closest '.card-slot'
 
@@ -57,7 +67,7 @@ jQuery.fn.extend {
     else
       notice = @attr('notify-success')
       newslot = @setSlotContent data
-        
+
       if newslot.jquery # sometimes response is plaintext
         wagn.initializeEditors newslot
         if notice?
@@ -82,7 +92,7 @@ jQuery.fn.extend {
       if form[0]
         $(form[0]).append notice
       else
-        slot.append notice 
+        slot.append notice
     notice.html message
     notice.show 'blind'
 
@@ -156,6 +166,12 @@ $(window).ready ->
         $("body").scrollTop slot_top_pos
       event.slotSuccessful = true
 
+  $('body').on 'loaded.bs.modal', null, (event) ->
+    unless event.slotSuccessful
+      wagn.initializeEditors $(event.target)
+      event.slotSuccessful = true
+
+
   $('body').on 'ajax:error', '.slotter', (event, xhr) ->
     $(this).slotError xhr.status, xhr.responseText
 
@@ -165,7 +181,7 @@ $(window).ready ->
 
   $('body').on 'ajax:beforeSend', '.slotter', (event, xhr, opt)->
     return if opt.skip_before_send
-    
+
     unless opt.url.match /home_view/ #avoiding duplication.  could be better test?
       opt.url = wagn.prepUrl opt.url, $(this).slot()
 
@@ -190,7 +206,7 @@ $(window).ready ->
           iframeUploadFilter = (data)-> data.find('body').html()
           opt.dataFilter = iframeUploadFilter
           # gets rid of default html and body tags
-        
+
         args = $.extend opt, (widget._getAJAXSettings data), url: opt.url
         # combines settings from wagn's slotter and jQuery UI's upload widget
         args.skip_before_send = true #avoid looping through this method again
@@ -205,33 +221,33 @@ $(window).ready ->
 
   $('body').on 'click', '.submitter', ->
     $(this).closest('form').submit()
-   
+
   $('body').on 'click', '.renamer-updater', ->
     $(this).closest('form').find('#card_update_referencers').val 'true'
-        
+
   $('body').on 'submit', '.edit_name-view .card-form', ->
     confirmer = $(this).find '.alert'
     if confirmer.is ':hidden'
       if $(this).find('#referers').val() > 0
         $(this).find('.renamer-updater').show()
-        
+
       confirmer.show 'blind'
       false
-    
-  
-  
+
+
+
   $('body').on 'click', '.follow-updater', ->
     $(this).closest('form').find('#card_update_all_users').val 'true'
-        
+
   $('body').on 'submit', '.edit-view.SELF-Xfollow_default .card-form', ->
     confirmer = $(this).find '.confirm_update_all-view'
     if confirmer.is ':hidden'
       $(this).find('.follow-updater').show()
-        
+
       confirmer.show 'blind'
       false
-  
-  
+
+
   $('body').on 'click', 'button.redirecter', ->
     window.location = $(this).attr('href')
 
@@ -239,10 +255,14 @@ $(window).ready ->
     $('body').on 'dblclick', 'div', (event) ->
       t = $(this)
       return false if t.closest( '.nodblclick'  )[0]
+      # fail if inside a div with "nodblclick" class
       return false if t.closest( '.card-header' )[0]
-      return false if t.find( '.card-editor' )[0]
+      # fail if inside a card header
       s = t.slot()
+      return false if s.find( '.card-editor' )[0]
+      # fail if there is an editor open in your slot
       return false unless s.data('cardId')
+      # fail if slot has not card id
       s.addClass 'slotter'
       s.attr 'href', wagn.rootPath + '/card/edit/~' + s.data('cardId')
       $.rails.handleRemote(s)
@@ -256,13 +276,6 @@ $(window).ready ->
       if input and !(input.val().match /^REDIRECT/)
         input.val ( if target == 'REDIRECT' then target + ': ' + input.val() else target )
 
-  #more of this info should be in views; will need to refactor for HTTP DELETE anyway...
-  $('.card-slot').on 'click', '.standard-delete', ->
-    return if $(this).attr('success-ready') == 'true' #prevent double-click weirdness
-    s = if $(this).isMain() then 'REDIRECT: *previous' else 'TEXT:' + $(this).slot().data('cardName') + ' removed'
-    $(this).attr 'href', $(this).attr('href') + '?success=' + encodeURIComponent(s)
-    $(this).attr 'success-ready', 'true'
-
   $('body').on 'change', '.live-type-field', ->
     $(this).data 'params', $(this).closest('form').serialize()
     $(this).data 'url', $(this).attr 'href'
@@ -279,7 +292,7 @@ $(window).ready ->
     $(this).html $(this).attr( 'hover_content' )
   $('body').on 'mouseleave', '[hover_content]', ->
     $(this).html $(this).attr( 'hover_restore' )
-    
+
   $('body').on 'keyup', '.name-editor input', ->
     box =  $(this)
     name = box.val()
@@ -297,7 +310,7 @@ $(window).ready ->
         slot_id = box.slot().data 'cardId' # use id to avoid warning when renaming to name variant
         if status != 'unknown' and !(slot_id && parseInt(slot_id) == data['id'])
           ed.addClass status + '-name known-name'
-          link = 
+          link =
           qualifier = if status == 'virtual' #wish coffee would let me use  a ? b : c syntax here
             'in virtual'
           else
@@ -305,13 +318,13 @@ $(window).ready ->
           msg.html '"<a href="' + wagn.rootPath + '/' + data['url_key'] + '">' + name + '</a>" ' + qualifier + ' use'
         else
           msg.html ''
-        
+
   $('body').on 'click', '.render-error-link', (event) ->
     msg = $(this).closest('.render-error').find '.render-error-message'
     msg.show()
 #    msg.dialog()
     event.preventDefault()
-	
+
 
 # important: this prevents jquery-mobile from taking over everything
 $( document ).on "mobileinit", ->
@@ -321,7 +334,6 @@ $( document ).on "mobileinit", ->
   }
 
 
-
 newCaptcha = (form)->
   recapUri = 'https://www.google.com/recaptcha/api/js/recaptcha_ajax.js'
   recapDiv = $('<div class="recaptcha-box"></div>')

data/mod/03_machines/lib/javascript/wagn_mod.js.coffee

@@ -29,13 +29,13 @@ $.extend wagn,
     input.autocomplete { source: wagn.prepUrl wagn.rootPath + '/' + optionsCard + '.json?view=name_complete' }
 
   setTinyMCEConfig: (string)->
-    setter = ()-> 
+    setter = ()->
       try
         $.parseJSON string
       catch
         {}
     wagn.tinyMCEConfig = setter()
-  
+
   initAce: (textarea) ->
     type_code = textarea.attr "data-card-type-code"
     hash = {}
@@ -67,8 +67,8 @@ $.extend wagn,
     editor.setOption "showPrintMargin", false
     editor.getSession().setTabSize 2
     editor.getSession().setUseSoftTabs true
-    editor.setOptions maxLines: 30 
-    
+    editor.setOptions maxLines: 30
+
     textarea.closest("form").submit ->
       textarea.val editor.getSession().getValue()
       return
@@ -126,113 +126,6 @@ $.extend wagn,
     editor.append '<input type="hidden" value="CHOSEN" class="upload-card-content" name="' + contentFieldName + '">'
     # we add and remove the contentField to insure that nothing is added / updated when nothing is chosen.
 
-  openMenu: (link, tapped) ->
-    l = $(link)
-    cm = l.data 'menu'
-    if !cm?
-      cm = wagn.generateMenu l.slot(), l.data('menu-vars')
-      l.data 'menu', cm
-      cm.menu position: { my:'right top', at:'left-2 top-3' }, icons: { submenu:'ui-icon-carat-1-w' } 
-      #TODO submenu should use glyphicon glyphicon-menu-left
-    
-    if tapped
-      cm.addClass 'card-menu-tappable'
-      
-    cm.show()
-    cm.position my:'right top', at:'right+2 top+2', of: link
-
-  closeMenu: (menu) ->
-    $(menu).hide()
-    $(menu).menu "collapseAll", null, true
-
-  
-  generateMenu: (slot, vars) ->
-    template_clone = $.extend true, {}, wagn.menu_template
-    items = wagn.generateMenuItems template_clone, vars
-  
-    m = $( '<ul class="card-menu">' + items.join("\n") +  '</ul>' )
-    slot.append m
-    m
-
-  generateMenuItems: (template, vars)->
-    items = []
-    $.each template, (index, i)->
-      return true if i.if && !vars[i.if]
-    
-      if i.text
-        i.text = i.text.replace /\%\{([^}]*)\}/, (m, val)-> vars[val]      
-        i.text = $('<div/>').text(i.text).html() #escapes html
-      
-      item = 
-        if i.raw
-          i.raw
-        else if i.link
-          vars[i.link]
-        else if i.plain
-          '<a>' + i.plain + '</a>'
-        else if i.page
-          page = vars[i.page] || i.page
-          text = i.text || page
-          if page == vars['self']
-            relpath = vars['linkname']
-          else if page.match /^[\w\+\*]+$/
-            relpath = page
-          else
-            relpath = '?' + $.param( 'card[name]' : page ) 
-            
-          '<a href="' + wagn.rootPath + '/' + relpath + '">' + text + ' &crarr;</a>'
-        else
-          wagn.generateStandardMenuItem i, vars
-
-      if item
-        if i.list
-          if listsub = wagn.generateListTemplate i.list, vars 
-            i.sub = listsub if listsub.length > 0
-
-        if i.sub
-          item += '<ul>' + wagn.generateMenuItems(i.sub, vars).join("\n") + '</ul>'
-    
-        items.push('<li>' + item + '</li>')
-    items
-
-  generateListTemplate: (list, vars)->
-    items = []
-    if list_vars = vars[list.name]
-      $.each list_vars, (index, itemvars)->
-        template = $.extend {}, list.template
-        $.map template, (val, key)->
-          template[key] = itemvars[template[key]] || template[key]
-        items.push template
-    
-    if list.append
-      items = items.concat list.append
-  
-    items
-
-  generateStandardMenuItem: (i, vars)->
-    params = i.path_opts || {}
-  
-    if i.related
-      i.view='related'
-      params['related'] = if typeof(i.related) == 'object'
-        $.extend {}, i.related, name: vars[i.related.name]
-      else
-        i.text ||= i.related
-        { 'name': '+*' + i.related }
-      
-    if i.view #following basically reproduces link_to_view.  make own function?
-      path = wagn.rootPath + '/'
-      if vars['creator']
-        path += vars['linkname']
-      else
-        params['card[name]'] = vars['self']
-      
-      params['view'] = i.view unless i.view == 'home'      
-      path += '?' + $.param(params) unless $.isEmptyObject params
-      
-      text = i.text || i.view
-      '<a href="' + path + '" data-remote="true" class="slotter">' + text + '</a>'
-
 
 $(window).ready ->
 
@@ -253,31 +146,6 @@ $(window).ready ->
     # sadly, it also causes odd navbox behavior, resetting the search term
   }
 
-  $('body').on 'mouseenter', '.card-menu-link', ->
-    wagn.openMenu this, false
-    
-  $('body').on 'mouseleave', '.card-menu', ->
-    wagn.closeMenu this
-
-  $(document).on 'tap', '.card-header', (event) ->
-    link = $(this).find('.card-menu-link')
-    unless !link[0] or                                             # no gear
-        link.data('menu') or                                       # already has menu
-        event.pageX - $(this).offset().left < $(this).width() / 2  # left half of header
-      
-      wagn.openMenu link, true
-      event.preventDefault()
-  
-  $(document).on 'tap', 'body', (event) ->
-    unless $(event.target).closest('.card-header')[0] or $(event.target).closest('.card-menu-link')[0]
-      $('.card-menu').hide()
-      # this and mouseleave should use a close menu method that handles collapsing. (though not seeing bad behavior...)
-
-  $(document).on 'tap', '.ui-menu-icon', (event)->
-    $(this).closest('li').trigger('mouseenter')
-    event.preventDefault()
-
-
   #pointer mod
   $('body').on 'click', '.pointer-item-add', (event)->
     last_item = $(this).closest('.content-editor').find '.pointer-li:last'
@@ -294,13 +162,13 @@ $(window).ready ->
       item.remove()
     else
       item.find('input').val ''
-    
+
   # following mod
   $('body').on 'click', '.btn-item-delete', ->
     $(this).find('.glyphicon').addClass("glyphicon-hourglass").removeClass("glyphicon-remove")
   $('body').on 'click', '.btn-item-add', ->
     $(this).find('.glyphicon').addClass("glyphicon-hourglass").removeClass("glyphicon-plus")
-    
+
   $('body').on 'mouseenter', '.btn-item-delete', ->
     $(this).find('.glyphicon').addClass("glyphicon-remove").removeClass("glyphicon-ok")
     $(this).addClass("btn-danger").removeClass("btn-primary")
@@ -308,6 +176,23 @@ $(window).ready ->
     $(this).find('.glyphicon').addClass("glyphicon-ok").removeClass("glyphicon-remove")
     $(this).addClass("btn-primary").removeClass("btn-danger")
 
+
+  $('body').on 'click', '.update-follow-link', (event) ->
+    anchor = $(this)
+    url  = wagn.rootPath + '/' + anchor.data('card_key') + '.json?view=follow_status'
+    modal =  anchor.closest('.modal')
+    modal.removeData()
+    $.ajax url, {
+      type : 'GET'
+      dataType : 'json'
+      success : (data) ->
+        tags = $(modal).parent().find('.follow-link')
+        tags.find('.follow-verb').html data.verb
+        tags.attr 'href', data.path
+        tags.attr 'title', data.title
+        tags.data 'follow', data
+    }
+
   $('body').on 'click', '.follow-toggle', (event) ->
     anchor = $(this)
     url  = wagn.rootPath + '/update/' + anchor.data('rule_name') + '.json'
@@ -320,14 +205,14 @@ $(window).ready ->
         'success[id]'   : anchor.data('card_key')
       }
       success : (data) ->
-        tags = anchor.closest('.card-menu').find('.follow-toggle')
+        tags = anchor.closest('.modal').parent().find('.follow-toggle')
         tags.find('.follow-verb').html data.verb
         tags.attr 'title', data.title
         tags.removeClass( 'follow-toggle-on follow-toggle-off').addClass data.class
         tags.data 'follow', data
     }
     event.preventDefault() # Prevent link from following its href
-    
+
 
   # permissions mod
   $('body').on 'click', '.perm-vals input', ->
@@ -343,8 +228,8 @@ $(window).ready ->
     f = $(this).closest('form')
     checked = f.find('.set-editor input:checked')
     if checked.val()
-      if checked.attr('warning') 
-        confirm checked.attr('warning') 
+      if checked.attr('warning')
+        confirm checked.attr('warning')
       else
         true
     else
@@ -356,6 +241,9 @@ $(window).ready ->
 #    $(this).closest('tr').find('.close-rule-link').click()
 
 
+  $('body').on 'click', '.submit-modal', ->
+    $(this).closest('.modal-content').find('form').submit()
+
   #wagn_org mod (for now)
   $('body').on 'click', '.shade-view h1', ->
     toggleThis = $(this).slot().find('.shade-content').is ':hidden'
@@ -366,10 +254,10 @@ $(window).ready ->
 
   if firstShade = $('.shade-view h1')[0]
     $(firstShade).trigger 'click'
-    
+
 
   # following not in use??
-  
+
   $('body').on 'change', '.go-to-selected select', ->
     val = $(this).val()
     if val != ''
@@ -378,10 +266,10 @@ $(window).ready ->
 
 toggleShade = (shadeSlot) ->
   shadeSlot.find('.shade-content').slideToggle 1000
-  shadeSlot.find('.glyphicon').toggleClass 'glyphicon-triangle-right glpyphicon-triangle-bottom'  
+  shadeSlot.find('.glyphicon').toggleClass 'glyphicon-triangle-right glpyphicon-triangle-bottom'
 
 permissionsContent = (ed) ->
-  return '_left' if ed.find('#inherit').is(':checked')  
+  return '_left' if ed.find('#inherit').is(':checked')
   groups = ed.find('.perm-group input:checked').map( -> $(this).val() )
   indivs = ed.find('.perm-indiv input'        ).map( -> $(this).val() )
   pointerContent $.makeArray(groups).concat($.makeArray(indivs))
@@ -396,7 +284,7 @@ reqIndex = 0 #prevents race conditions
 navbox_results = (request, response) ->
   f = this.element.closest 'form'
   formData = f.serialize() + '&view=complete'
-  
+
   this.xhr = $.ajax {
     url: wagn.prepUrl wagn.rootPath + '/:search.json'
     data: formData
@@ -444,4 +332,4 @@ navbox_select = (event, ui) ->
   $(this).attr('disabled', 'disabled')
 
 
-  
+