dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed preview of auth.wiki pages

Browse Source
This commit is contained in:
Massimo
2013-01-10 15:13:29 -06:00
parent 70d701db5b
commit b8cfc9630f
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.01.10.14.53.47 Version 2.4.1-alpha.2+timestamp.2013.01.10.15.12.56
gluon/tools.py
+15 -16
View File
@@ -4993,20 +4993,19 @@ class Wiki(object):
redirect(URL(args=slug)) redirect(URL(args=slug))
script = """ script = """
$(function() { $(function() {
if (!$('#wiki_page_body').length) return; if (!jQuery('#wiki_page_body').length) return;
var pagecontent = $('#wiki_page_body'); var pagecontent = jQuery('#wiki_page_body');
pagecontent.css('font-family', pagecontent.css('font-family',
'Monaco,Menlo,Consolas,"Courier New",monospace'); 'Monaco,Menlo,Consolas,"Courier New",monospace');
var prevbutton = $('<button class="btn nopreview">Preview</button>'); var prevbutton = jQuery('<button class="btn nopreview">Preview</button>');
var mediabutton = $('<button class="btn nopreview">Media</button>'); var mediabutton = jQuery('<button class="btn nopreview">Media</button>');
var preview = $('<div id="preview"></div>').hide(); var preview = jQuery('<div id="preview"></div>').hide();
var previewmedia = $('<div id="previewmedia"></div>'); var previewmedia = jQuery('<div id="previewmedia"></div>');
var table = $('form'); var form = pagecontent.closest('form');
var bodylabel = $('#wiki_page_body__label'); preview.insertBefore(form);
preview.insertBefore(pagecontent); prevbutton.insertBefore(form);
prevbutton.insertAfter(bodylabel); mediabutton.insertBefore(form);
mediabutton.insertBefore(table); previewmedia.insertBefore(form);
previewmedia.insertBefore(table);
mediabutton.toggle(function() { mediabutton.toggle(function() {
web2py_component('%(urlmedia)s', 'previewmedia'); web2py_component('%(urlmedia)s', 'previewmedia');
}, function() { }, function() {
@@ -5017,12 +5016,12 @@ class Wiki(object):
if (prevbutton.hasClass('nopreview')) { if (prevbutton.hasClass('nopreview')) {
prevbutton.addClass('preview').removeClass( prevbutton.addClass('preview').removeClass(
'nopreview').html('Edit Source'); 'nopreview').html('Edit Source');
web2py_ajax_page('post', '%(url)s', {body : $('#wiki_page_body').val()}, 'preview'); web2py_ajax_page('post', '%(url)s', {body : jQuery('#wiki_page_body').val()}, 'preview');
pagecontent.fadeOut('fast', function() {preview.fadeIn()}); form.fadeOut('fast', function() {preview.fadeIn()});
} else { } else {
prevbutton.addClass( prevbutton.addClass(
'nopreview').removeClass('preview').html('Preview'); 'nopreview').removeClass('preview').html('Preview');
preview.fadeOut('fast', function() {pagecontent.fadeIn()}); preview.fadeOut('fast', function() {form.fadeIn()});
} }
}) })
}) })
@@ -5046,7 +5045,7 @@ class Wiki(object):
csv = True csv = True
create = True create = True
if current.request.vars.embedded: if current.request.vars.embedded:
script = "var c = $('#wiki_page_body'); c.val(c.val() + $('%s').text()); return false;" script = "var c = jQuery('#wiki_page_body'); c.val(c.val() + jQuery('%s').text()); return false;"
fragment = self.auth.db.wiki_media.id.represent fragment = self.auth.db.wiki_media.id.represent
csv = False csv = False
create = False create = False