@@ -265,8 +265,8 @@ class NodesController < ApplicationController
flash.now[:error] = _('could not update')
end
- if params[:attachment]
- responds_to_parent do # execute the redirect in the main window
+ if params[:iframe]
+ responds_to_parent do # execute the redirect in the iframe's parent window
render :update do |page|
page.call "UploadProgress.setAsFinished"
page.delay(1) do # allow the progress bar fade to complete
@@ -283,7 +283,7 @@ class NodesController < ApplicationController
redirect_to zen_path(@node, :mode => params[:mode])
end
end
- format.js { @flash = flash }
+ format.js { @flash = flash }
end
end
end
app/controllers/nodes_controller.rb
@@ -78,6 +78,24 @@ class VersionsController < ApplicationController
@edit = true
end
end
+ if params[:close] == 'true'
+ js_data << "Zena.reloadAndClose();"
+ else
+ js_data << <<-END_TXT
+ var current_sel = $('text_sel');
+ var current_tab = $('text_tab');
+
+ Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
+ Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
+ Zena.resizeElement('node_v_text');
+
+ $('node_form').getElements().each(function(input, index) {
+ new Form.Element.Observer(input, 3, function(element, value) {
+ opener.Zena.editor_preview('#{preview_node_version_path(:node_id=>@node[:zip], :id=>(@node.v_number || 0), :escape => false)}',element,value);
+ });
+ });
+ END_TXT
+ end
end
def custom_tab
app/controllers/versions_controller.rb
@@ -13,10 +13,10 @@
</div>
<div class='validate'>
<div>
- <input name="validate" type="submit" value="<%= _('validate') %>" />
+ <input name='validate' type='submit' value='<%= _('validate') %>' />
</div>
<div>
- <input name="save" onclick="return Zena.save('<%= save_text_node_path(:id => @node[:zip]) %>',this.form,false);" type="button" value="<%= _('save') %>" />
+ <input name='save' onclick="return Zena.save('<%= save_text_node_path(:id => @node[:zip]) %>',this.form,false);" type='button' value='<%= _('save') %>' />
</div>
<div><a href='#' onclick='uploader=window.open("<%= new_document_path(:parent_id=>@node[:zip])%>", "uploader", "location=1,width=400,height=300");uploader.opener = opener;return false;'><%= _('btn_add_document')%></a></div>
<% if @node.can_publish? && !visitor.site.auto_publish? %><div><small><input type='checkbox' name='node[v_backup]' value='true'/> <%= _('bak') %></small> <small><input type='checkbox' name='node[v_status]' value='50'<%= params[:pub] ? " checked='checked'" : '' %>/> <%= _('pub') %></small></div><% end -%>
@@ -29,27 +29,3 @@
</form>
</div>
-
-<%#= css_edit %>
-<% javascript_tag do -%>
-var current_sel = $('<%= partial[0] %>_sel');
-var current_tab = $('<%= partial[0] %>_tab');
-Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
-Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
-function popup_loaded() {
-<% if params[:close] == 'true' %>
- opener.window.location.href = opener.window.location.href;
- window.close();
-<% else -%>
- Zena.resizeElement('node_v_text');
-<% end -%>
-}
-
-$('node_form').getElements().each(function(input, index) {
- new Form.Element.Observer(input, 3, function(element, value) {
- <%= "opener.Zena.editor_preview('#{preview_node_version_path(:node_id=>@node[:zip], :id=>(@node.v_number || 0), :escape => false)}',element,value);" %>
- });
-});
-
-<% end -%>
-<iframe id="UploadIFrame" name="UploadIFrame" src="about:blank"></iframe>
\ No newline at end of file
app/views/versions/edit.rhtml
@@ -1,5 +1,5 @@
# Settings specified here will take precedence over those in config/environment.rb
-config.log_level = :warn
+config.log_level = :info
# The production environment is meant for finished, "live" apps.
# Code is not reloaded between requests
config/environments/production.rb
@@ -9,26 +9,11 @@
<r:stylesheets list='popup,zena,search,upload-progress'/>
<r:javascripts list='prototype,effects,dragdrop,zena,upload-progress'/>
-<script type="text/javascript" charset="utf-8">
-// <![CDATA[
- // for popup windows (do not reload page)
- var is_editor = true;
- function popup_loaded() {
- ; // dummy
- }
-// ]]>
-</script>
<r:uses_datebox/>
</head>
-<body onload='popup_loaded();'>
+<body>
<div id='loader'><img src='/images/ajax-loader.gif'/> <r:trans text='uploading'/></div>
- <div id="ProgressBarContainer">
- <div id="ProgressBarShell" style="display:none;">
- <div id="ProgressBarText"> </div>
- <div id="ProgressBar"> </div>
- </div>
- </div>
<div id='messages'>
</div>
db/init/base/skins/default/Node-+popupLayout.zafu
@@ -252,6 +252,7 @@ module Zena
# TODO: test
def popup_layout
+ js_data << "var is_editor = true;"
template_url(:mode=>'+popupLayout')
end
lib/zena/use/rendering.rb
locale/en/LC_MESSAGES/zena.mo
@@ -199,7 +199,7 @@ msgstr "<img src='/images/lock.png' alt='closed'/>"
#: app/helpers/application_helper.rb:1073
msgid "btn_title_open_discussion"
-msgstr "Open the edition window to edit the node's text, title, etc."
+msgstr "Open the edition window to edit the node"
#: app/helpers/application_helper.rb:1076
#: app/views/comments/_li.rhtml:3
@@ -1661,11 +1661,11 @@ msgstr "<img src='/images/add.png' alt='add'/>"
#: lib/gettext_strings.rb:26
msgid "btn_title_edit"
-msgstr "Open the edition window to edit the node's text, title, etc."
+msgstr "Open the edition window to edit the node."
#: lib/gettext_strings.rb:27
msgid "btn_title_drive"
-msgstr "Open the drive window to change the node's location, links, etc."
+msgstr "Open the drive window to change the location, links, etc."
#: lib/gettext_strings.rb:33
msgid "btn_site_add"
locale/en/zena.po
@@ -3,17 +3,19 @@
// and to fix some strange Safari bugs.
function submitUploadForm(form, uuid) {
+ if (!$('attachment' + uuid)) return;
if ($('progress_bar' + uuid)) return;
- var need_progress = $('attachment' + uuid);
+
// create iframe and alter form to submit to an iframe
- if (!$('UploadIFrame')) {
- $(document.body).insert('<iframe id="UploadIFrame" name="UploadIFrame" src="about:blank"></iframe>');
+ if (!$('using_iframe')) {
+ if (!$('UploadIFrame')) {
+ $(document.body).insert('<iframe id="UploadIFrame" name="UploadIFrame" src="about:blank"></iframe>');
+ }
+ $(form).insert("<input id='using_iframe' type='hidden' name='iframe' value='true'/>");
+ $(form).target = 'UploadIFrame';
}
- $(form).target = 'UploadIFrame';
- if (need_progress) {
- // make sure the POST occurs before (Safari Bug)
- UploadProgress.monitor(uuid, form);
- }
+ // make sure the POST occurs before (Safari Bug)
+ UploadProgress.monitor(uuid, form);
$(form).submit();
}
public/javascripts/upload-progress.js
@@ -27,7 +27,7 @@ Zena.version_diff = function(id, from, to) {
Zena.save = function(url, form, close_on_complete) {
if ($(form).select('[name="attachment"]')[0]) {
// do not use ajax call
- eval(form.onsubmit().getAttribute('onsubmit'));
+ eval(form.getAttribute('onsubmit'));
return true;
} else {
if (close_on_complete) {
@@ -504,6 +504,12 @@ Zena.select_tab = function(name) {
current_tab.style.display = '';
}
+Zena.reloadAndClose = function() {
+ opener.window.location.href = opener.window.location.href;
+ window.close();
+}
+
+// POPUP GALLERY
Zena.popup_gallery = null;
Zena.popup = function(elem) {
@@ -652,4 +658,4 @@ Zena.popup_close = function() {
}
});
}
-}
\ No newline at end of file
+}
public/javascripts/zena.js
7fb0fdb532ba6bcceb30032a5f51060942becf2e
Gaspard Bucher
gaspard@teti.ch
http://github.com/zena/zena/commit/7f1780cd361ec683eeaabd044980a3234c53ffe3
7f1780cd361ec683eeaabd044980a3234c53ffe3
2009-11-02T02:04:43-08:00
2009-11-02T02:04:43-08:00
Fixed some javascript related bugs when submitting content through an iframe (upload).
be7cc87df770be8c58e584a5ee78345992ee4355
Gaspard Bucher
gaspard@teti.ch