github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

asset picker was not accessible from the Aloha toolbar (fixed now)

Browse Source
This commit is contained in:
did 2012-06-06 01:34:37 -07:00
parent 55b7d4dbf2
commit 11c4f98efc
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/aloha/plugins/custom/locomotive_media/lib/locomotive_media-plugin.js
View File

@ -25,7 +25,7 @@ define(
picker.close(); picker.close();
} }
picker.render() picker.fetch_assets();
}, },
/** /**

9
app/assets/javascripts/locomotive/views/inline_editor/application_view.js.coffee
View File

@ -24,6 +24,8 @@ class Locomotive.Views.InlineEditor.ApplicationView extends Backbone.View
@toolbar_view.render() @toolbar_view.render()
@content_assets_picker_view.render()
enable_iframe_autoheight: -> enable_iframe_autoheight: ->
iframe = @iframe iframe = @iframe
@ -89,6 +91,13 @@ class Locomotive.Views.InlineEditor.ApplicationView extends Backbone.View
toolbar_view.show_status 'loading' toolbar_view.show_status 'loading'
window.history.pushState('Object', 'Title', link.attr('href').replace('_edit', '_admin')) window.history.pushState('Object', 'Title', link.attr('href').replace('_edit', '_admin'))
unique_dialog_zindex: ->
# returns the number of jQuery UI modals created in order to set a valid zIndex for each of them.
# Each modal window should have a different zIndex, otherwise there will be conflicts between them.
window.Locomotive.jQueryModals ||= 0
1050 + window.Locomotive.jQueryModals++
_$: (selector) -> _$: (selector) ->
$(selector, @iframe[0].contentWindow.document) $(selector, @iframe[0].contentWindow.document)