Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

tweaked notice handling, fixed cp bug

  • Loading branch information...
commit d1fa6db10a168fdc4f413a9a9f66582531908093 1 parent 57c2747
@ethn ethn authored
View
8 app/assets/javascripts/wagn.js.coffee
@@ -125,7 +125,7 @@ $(window).ready ->
$('.slotter').live 'ajax:beforeSend', (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()
@@ -150,7 +150,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
@@ -163,8 +163,8 @@ $(window).ready ->
$(this).find('.card-content').attr('no-autosave','true')
true
-# $('.submitter').live 'click', ->
-# $(this).closest('form').submit()
+ $('.submitter').live 'click', ->
+ $(this).closest('form').submit()
$('.renamer-updater').live 'click', ->
$(this).closest('form').find('.update_referencers').val 'true'
View
2  lib/wagn/set/all/rich_html.rb
@@ -223,6 +223,7 @@ module Set::All::RichHtml
</div>
</fieldset>
</div>
+ #{ notice }
}
end
end)
@@ -260,6 +261,7 @@ module Set::All::RichHtml
#{ button_tag 'Cancel', :class=>'cancel-button slotter', :href=>path, :type=>'button' }
</div>
</fieldset>
+ #{ notice }
}
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.