diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js b/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js index 29d57204..3010fae6 100644 --- a/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js +++ b/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js @@ -5,7 +5,7 @@ * Usage: * $.GollumEditor(); on DOM ready. */ -// (function($) { +(function($) { // Editor options var DefaultOptions = { @@ -35,10 +35,10 @@ } if ( EditorHas.editSummaryMarkup() ) { - Placeholder.add( $('#gollum-editor-edit-summary input') ) + $.GollumEditor.Placeholder.add($('#gollum-editor-edit-summary input')); $('#gollum-editor form[name="gollum-editor"]').submit(function( e ) { e.preventDefault(); - Placeholder.clearAll(); + $.GollumEditor.Placeholder.clearAll(); debug('submitting'); $(this).unbind('submit'); $(this).submit(); @@ -456,54 +456,6 @@ FunctionBar.replaceFieldSelection( $('#gollum-editor-body'), repText ); } - - var Placeholder = { - - _PLACEHOLDERS : [], - - _p : function( $field ) { - - this.fieldObject = $field; - this.placeholderText = $field.val(); - var placeholderText = $field.val(); - - $field.addClass('ph'); - - $field.blur(function() { - if ( $(this).val() == '' ) { - $(this).val( placeholderText ); - $(this).addClass('ph'); - } - }); - - $field.focus(function() { - $(this).removeClass('ph'); - if ( $(this).val() == placeholderText ) { - $(this).val(''); - } else { - $(this)[0].select(); - } - }); - - }, - - add : function( $field ) { - Placeholder._PLACEHOLDERS.push( new Placeholder._p( $field ) ); - }, - - clearAll: function() { - for ( var i=0; i < Placeholder._PLACEHOLDERS.length; i++ ) { - if ( Placeholder._PLACEHOLDERS[i].fieldObject.val() == - Placeholder._PLACEHOLDERS[i].placeholderText ) { - Placeholder._PLACEHOLDERS[i].fieldObject.val(''); - } - } - }, - - exists : function() { - return ( _PLACEHOLDERS.length ); - } - - }; + $.GollumEditor.Placeholder = $.GollumPlaceholder; -// })(jQuery); +})(jQuery); diff --git a/lib/gollum/frontend/public/javascript/gollum.placeholder.js b/lib/gollum/frontend/public/javascript/gollum.placeholder.js new file mode 100644 index 00000000..51e143d1 --- /dev/null +++ b/lib/gollum/frontend/public/javascript/gollum.placeholder.js @@ -0,0 +1,54 @@ +(function($) { + + var Placeholder = { + + _PLACEHOLDERS : [], + + _p : function( $field ) { + + this.fieldObject = $field; + this.placeholderText = $field.val(); + var placeholderText = $field.val(); + + $field.addClass('ph'); + + $field.blur(function() { + if ( $(this).val() == '' ) { + $(this).val( placeholderText ); + $(this).addClass('ph'); + } + }); + + $field.focus(function() { + $(this).removeClass('ph'); + if ( $(this).val() == placeholderText ) { + $(this).val(''); + } else { + $(this)[0].select(); + } + }); + + }, + + add : function( $field ) { + Placeholder._PLACEHOLDERS.push( new Placeholder._p( $field ) ); + }, + + clearAll: function() { + for ( var i=0; i < Placeholder._PLACEHOLDERS.length; i++ ) { + if ( Placeholder._PLACEHOLDERS[i].fieldObject.val() == + Placeholder._PLACEHOLDERS[i].placeholderText ) { + Placeholder._PLACEHOLDERS[i].fieldObject.val(''); + } + } + }, + + exists : function() { + return ( _PLACEHOLDERS.length ); + } + + }; + + $.GollumPlaceholder = Placeholder; + +})(jQuery); \ No newline at end of file