Backport some JS changes from github.com
This commit is contained in:
@@ -62,7 +62,7 @@
|
|||||||
// get form fields
|
// get form fields
|
||||||
var oldAction = $('#gollum-editor form').attr('action');
|
var oldAction = $('#gollum-editor form').attr('action');
|
||||||
var $form = $($('#gollum-editor form').get(0));
|
var $form = $($('#gollum-editor form').get(0));
|
||||||
$form.attr('action', '/preview');
|
$form.attr('action', this.href || '/preview');
|
||||||
$form.attr('target', '_blank');
|
$form.attr('target', '_blank');
|
||||||
$form.submit();
|
$form.submit();
|
||||||
|
|
||||||
@@ -154,7 +154,13 @@
|
|||||||
define: function( name, definitionObject ) {
|
define: function( name, definitionObject ) {
|
||||||
LanguageDefinition._ACTIVE_LANG = name;
|
LanguageDefinition._ACTIVE_LANG = name;
|
||||||
LanguageDefinition._LOADED_LANGS.push( name );
|
LanguageDefinition._LOADED_LANGS.push( name );
|
||||||
LanguageDefinition._LANG[name] = definitionObject;
|
if ( typeof $.GollumEditor.WikiLanguage == 'object' ) {
|
||||||
|
var definition = {};
|
||||||
|
$.extend(definition, $.GollumEditor.WikiLanguage, definitionObject);
|
||||||
|
LanguageDefinition._LANG[name] = definition;
|
||||||
|
} else {
|
||||||
|
LanguageDefinition._LANG[name] = definitionObject;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
getActiveLanguage: function() {
|
getActiveLanguage: function() {
|
||||||
@@ -808,6 +814,12 @@
|
|||||||
|
|
||||||
// generate help menus
|
// generate help menus
|
||||||
Help.generateHelpMenuFor( name );
|
Help.generateHelpMenuFor( name );
|
||||||
|
|
||||||
|
if ( $('#gollum-editor-help').length &&
|
||||||
|
typeof $('#gollum-editor-help').attr('data-autodisplay') !== 'undefined' &&
|
||||||
|
$('#gollum-editor-help').attr('data-autodisplay') === 'true' ) {
|
||||||
|
Help.show();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ( $('#function-help').length ) {
|
if ( $('#function-help').length ) {
|
||||||
@@ -1006,7 +1018,15 @@
|
|||||||
*/
|
*/
|
||||||
evtHelpButtonClick: function( e ) {
|
evtHelpButtonClick: function( e ) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if ( Help.isShown() ) { Help.hide(); }
|
if ( Help.isShown() ) {
|
||||||
|
// turn off autodisplay if it's on
|
||||||
|
if ( $('#gollum-editor-help').length &&
|
||||||
|
$('#gollum-editor-help').attr('data-autodisplay') !== 'undefined' &&
|
||||||
|
$('#gollum-editor-help').attr('data-autodisplay') === 'true' ) {
|
||||||
|
$.post('/wiki/help?_method=delete');
|
||||||
|
$('#gollum-editor-help').attr('data-autodisplay', '');
|
||||||
|
}
|
||||||
|
Help.hide(); }
|
||||||
else { Help.show(); }
|
else { Help.show(); }
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user