gollum 1.3.1 → 1.4.2

data/lib/gollum/frontend/public/javascript/editor/langs/pod.js

@@ -1,40 +1,40 @@
 /**
  *  Pod Language Definition
 **/
-(function() {
+(function($) {
 
 var Pod = {
-  
+
   'function-bold' :         {
                               search: /(^[\n]+)([\n\s]*)/g,
                               replace: "B<$1>$2"
                             },
-  
+
   'function-italic' :       {
                               search: /(^[\n]+)([\n\s]*)/g,
                               replace: "I<$1>$2"
                             },
-  
+
   'function-code'   :       {
                               search: /(^[\n]+)([\n\s]*)/g,
                               replace: "C<$1>$2"
                             },
-                            
+
   'function-h1'         :   {
                               search: /(.+)([\n]?)/gi,
                               replace: "=head1 $1$2"
                             },
-                            
+
   'function-h2'         :   {
                               search: /(.+)([\n]?)/gi,
                               replace: "=head2 $1$2"
                             },
-                            
+
   'function-h3'         :   {
                               search: /(.+)([\n]?)/gi,
                               replace: "=head3 $1$2"
                             },
-                            
+
   'function-link'       :   {
                               exec: function( txt, selText, $field ) {
                                 var results = null;
@@ -55,18 +55,18 @@ var Pod = {
                                   OK: function( res ) {
                                    var rep = '';
                                    if ( res['text'] && res['href'] ) {
-                                      rep = 'L<' + res['text'] + '|' 
-                                             + res['href'] + '>';
+                                      rep = 'L<' + res['text'] + '|' +
+                                             res['href'] + '>';
                                     }
                                     $.GollumEditor.replaceSelection( rep );
                                   }
-                                }); 
+                                });
                               }
                             }
-                            
+
 };
 
-jQuery.GollumEditor.defineLanguage('pod', Pod);
+$.GollumEditor.defineLanguage('pod', Pod);
 
 
 var PodHelp = [
@@ -106,6 +106,6 @@ var PodHelp = [
                 }
 ];
 
-jQuery.GollumEditor.defineHelp('pod', PodHelp);
+$.GollumEditor.defineHelp('pod', PodHelp);
 
-})();
+})(jQuery);

data/lib/gollum/frontend/public/javascript/editor/langs/rdoc.js

@@ -1,9 +1,9 @@
 /**
  *  Markdown Language Definition
- *  
- *  A language definition for string manipulation operations, in this case 
+ *
+ *  A language definition for string manipulation operations, in this case
  *  for the Markdown, uh, markup language. Uses regexes for various functions
- *  by default. If regexes won't do and you need to do some serious 
+ *  by default. If regexes won't do and you need to do some serious
  *  manipulation, you can declare a function in the object instead.
  *
  *  Code example:
@@ -14,27 +14,27 @@
  *                          search: /somesearchregex/gi,
  *                          replace: 'replace text for RegExp.replace',
  *                          append: "just add this where the cursor is"
- *                         }  
+ *                         }
  *
 **/
-(function() {
+(function($) {
 
 var RDoc = {
-  
+
   'function-bold' :         {
                               search: /([^\n]+)([\n\s]*)/g,
                               replace: "((*$1*))$2"
-                            }
+                            },
   'function-code'   :       {
                               search: /([^\n]+)([\n\s]*)/g,
                               replace: "(({$1}))$2"
                             },
-  
-  'function-ul'     :       { 
+
+  'function-ul'     :       {
                               search: /(.+)([\n]?)/gi,
                               replace: "* $1$2"
                             },
-                    
+
   'function-ol'   :         {
                               exec: function( txt, selText, $field ) {
                                 var count = 1;
@@ -51,24 +51,24 @@ var RDoc = {
                                 $.GollumEditor.replaceSelection( repText );
                               }
                             },
-                            
+
   'function-h1'         :   {
                               search: /(.+)([\n]?)/gi,
                               replace: "= $1$2"
                             },
-                            
+
   'function-h2'         :   {
                               search: /(.+)([\n]?)/gi,
                               replace: "== $1$2"
                             },
-                            
+
   'function-h3'         :   {
                               search: /(.+)([\n]?)/gi,
                               replace: "=== $1$2"
                             }
-                            
+
 };
 
-jQuery.GollumEditor.defineLanguage('rdoc', RDoc);
+$.GollumEditor.defineLanguage('rdoc', RDoc);
 
-})();
+})(jQuery);

data/lib/gollum/frontend/public/javascript/editor/langs/textile.js

@@ -1,44 +1,44 @@
 /**
  *  Textile Language Definition
  */
-(function() {
+(function($) {
 
 var Textile = {
-  
+
   'function-bold' :         {
                               search: /(^[\n]+)([\n\s]*)/g,
                               replace: "*$1*$2"
                             },
-  
+
   'function-italic' :       {
                               search: /(^[\n]+)([\n\s]*)/g,
                               replace: "_$1_$2"
                             },
-                            
+
   'function-hr'     :       {
                               append: "\n***\n"
                             },
-  
+
   'function-code'   :       {
                               search: /(^[\n]+)([\n\s]*)/g,
                               replace: "<pre><code>$1</code></pre>$2"
                             },
-  
-  'function-ul'     :       { 
+
+  'function-ul'     :       {
                               search: /(.+)([\n]?)/gi,
                               replace: "* $1$2"
                             },
-                    
+
   'function-ol'   :         {
                               search: /(.+)([\n]?)/gi,
                               replace: "# $1$2"
                             },
-                            
+
   'function-blockquote' :   {
                               search: /(.+)([\n]?)/gi,
                               replace: "bq. $1$2"
                             },
-                            
+
   'function-link'       :   {
                               exec: function( txt, selText, $field ) {
                                 var results = null;
@@ -67,11 +67,11 @@ var Textile = {
                                    $.GollumEditor.replaceSelection( h );
                                   }
                                 });
-                                
-                               
+
+
                               }
                             },
-                     
+
   'function-image'      :   {
                               exec: function( txt, selText, $field ) {
                                 var results = null;
@@ -102,10 +102,10 @@ var Textile = {
                                 });
                               }
                             }
-                            
+
 };
 
-jQuery.GollumEditor.defineLanguage('textile', Textile);
+$.GollumEditor.defineLanguage('textile', Textile);
 
 
 var TextileHelp = [
@@ -170,6 +170,6 @@ var TextileHelp = [
   }
 ];
 
-jQuery.GollumEditor.defineHelp('textile', TextileHelp);
+$.GollumEditor.defineHelp('textile', TextileHelp);
 
-})();
+})(jQuery);

data/lib/gollum/frontend/public/javascript/gollum.dialog.js

@@ -4,171 +4,222 @@
   *  Used for dialogs. Duh.
   *
   */
-  
+
 (function($) {
-   
-   var Dialog = {
-     
-     debugOn: false,
-     markupCreated: false,
-     
-     attachEvents: function( evtOK ) {
-       $('#gollum-dialog-action-ok').click(function( e ) {
+
+  var Dialog = {
+
+    debugOn: false,
+    markupCreated: false,
+    markup: '',
+
+    attachEvents: function( evtOK ) {
+      $('#gollum-dialog-action-ok').click(function( e ) {
         Dialog.eventOK( e, evtOK );
-       });
-       $('#gollum-dialog-action-cancel').click( Dialog.eventCancel );
-     },
-   
-     createFieldMarkup: function( fieldArray ) {
-       var fieldMarkup = '<fieldset>';
-       for ( var i=0; i < fieldArray.length; i++ ) {
-         if ( typeof fieldArray[i] == 'object' ) {
-           fieldMarkup += '<div class="field">';
-           switch ( fieldArray[i].type ) {
-           
-             // only text is supported for now
-             case 'text':
-              fieldMarkup += Dialog.createFieldText( fieldArray[i] );
-              break;
-              
-             default:
-              break;
-           
-           }
-           fieldMarkup += '</div>';
-         }
-       
-       }
-       fieldMarkup += '</fieldset>';
-       return fieldMarkup;
-     },
-   
-     createFieldText: function( fieldAttributes ) {
-       var html = '';
-     
-       if ( fieldAttributes.name ) {
-         html += '<label';
-         if ( fieldAttributes.id ) {
-           html += ' for="' + fieldAttributes.name + '"';
-         }
-         html += '>' + fieldAttributes.name + '</label>';
-       }
-     
-       html += '<input type="text"';
-     
-       if ( fieldAttributes.id ) {
-         html += ' name="' + fieldAttributes.id + '"'
-         if ( fieldAttributes.type == 'code' ) {
-           html+= ' class="code"';
-         }
-         html += ' id="gollum-dialog-dialog-generated-field-' +
-                 fieldAttributes.id + '">';
-       }
-     
-       return html;
-     },
-   
-     createMarkup: function( title, body ) {
-       Dialog.markupCreated = true;
-       return  '<div id="gollum-dialog-dialog">' +
+      });
+      $('#gollum-dialog-action-cancel').click( Dialog.eventCancel );
+      $('#gollum-dialog-dialog input[type="text"]').keydown(function( e ) {
+        if ( e.keyCode == 13 ) {
+          Dialog.eventOK( e, evtOK );
+        }
+      });
+    },
+
+    detachEvents: function() {
+      $('#gollum-dialog-action-ok').unbind('click');
+      $('#gollum-dialog-action-cancel').unbind('click');
+    },
+
+    createFieldMarkup: function( fieldArray ) {
+      var fieldMarkup = '<fieldset>';
+      for ( var i=0; i < fieldArray.length; i++ ) {
+        if ( typeof fieldArray[i] == 'object' ) {
+          fieldMarkup += '<div class="field">';
+          switch ( fieldArray[i].type ) {
+
+          // only text is supported for now
+          case 'text':
+            fieldMarkup += Dialog.createFieldText( fieldArray[i] );
+            break;
+
+          default:
+            break;
+
+          }
+          fieldMarkup += '</div>';
+        }
+
+      }
+      fieldMarkup += '</fieldset>';
+      return fieldMarkup;
+    },
+
+    createFieldText: function( fieldAttributes ) {
+      var html = '';
+
+      if ( fieldAttributes.name ) {
+        html += '<label';
+        if ( fieldAttributes.id ) {
+          html += ' for="' + fieldAttributes.name + '"';
+        }
+        html += '>' + fieldAttributes.name + '</label>';
+      }
+
+      html += '<input type="text"';
+
+      if ( fieldAttributes.id ) {
+        html += ' name="' + fieldAttributes.id + '"'
+        if ( fieldAttributes.type == 'code' ) {
+          html+= ' class="code"';
+        }
+        html += ' id="gollum-dialog-dialog-generated-field-' +
+          fieldAttributes.id + '">';
+      }
+
+      return html;
+    },
+
+    createMarkup: function( title, body ) {
+      Dialog.markupCreated = true;
+      if ($.facebox) {
+        return '<div id="gollum-dialog-dialog">' +
+               '<div id="gollum-dialog-dialog-title"><h4>' +
+               title +'</h4></div>' +
+               '<div id="gollum-dialog-dialog-body">' + body + '</div>' +
+               '<div id="gollum-dialog-dialog-buttons">' +
+               '<a href="#" title="Cancel" id="gollum-dialog-action-cancel" ' +
+               'class="gollum-minibutton">Cancel</a>' +
+               '<a href="#" title="OK" id="gollum-dialog-action-ok" '+
+               'class="gollum-minibutton">OK</a>' +
+               '</div>' +
+               '</div>';
+      } else {
+        return '<div id="gollum-dialog-dialog">' +
                '<div id="gollum-dialog-dialog-inner">' +
                '<div id="gollum-dialog-dialog-bg">' +
-               '<div id="gollum-dialog-dialog-title"><h4>' + 
-                 title +'</h4></div>' +
-               '<div id="gollum-dialog-dialog-body">' + body + '</div>' + 
-               '<div id="gollum-dialog-dialog-buttons">' + 
-               '<a href="#" title="Cancel" id="gollum-dialog-action-cancel" ' + 
+               '<div id="gollum-dialog-dialog-title"><h4>' +
+               title +'</h4></div>' +
+               '<div id="gollum-dialog-dialog-body">' + body + '</div>' +
+               '<div id="gollum-dialog-dialog-buttons">' +
+               '<a href="#" title="Cancel" id="gollum-dialog-action-cancel" ' +
                'class="minibutton">Cancel</a>' +
-               '<a href="#" title="OK" id="gollum-dialog-action-ok" '+ 
+               '<a href="#" title="OK" id="gollum-dialog-action-ok" '+
                'class="minibutton">OK</a>' +
                '</div>' +
-               '</div>' + 
-               '</div>' + 
+               '</div>' +
+               '</div>' +
                '</div>';
-     },
-   
-     eventCancel: function( e ) {
-       e.preventDefault();
-       debug('Cancelled dialog.');
-       Dialog.hide();
-     },
-   
-     eventOK: function( e, evtOK ) {
-       e.preventDefault();
-     
-       var results = [];
-       // get the results from each field and build them into the object
-       $('#gollum-dialog-dialog-body input').each(function() {
-         results[$(this).attr('name')] = $(this).val();
-       });
-     
-       // pass them to evtOK if it exists (which it should)
-       if ( evtOK &&
-            typeof evtOK == 'function' ) {
-         evtOK( results );
-       }
-       Dialog.hide();
-     },
-
-     hide: function() {
-       if ( $.browser.msie ) {
-         $('#gollum-dialog-dialog').hide().removeClass('active');
-         $('select').css('visibility', 'visible'); 
-       } else {
-         $('#gollum-dialog-dialog').animate({ opacity: 0 }, {
+      }
+    },
+
+    eventCancel: function( e ) {
+      e.preventDefault();
+      debug('Cancelled dialog.');
+      Dialog.hide();
+    },
+
+    eventOK: function( e, evtOK ) {
+      e.preventDefault();
+
+      var results = [];
+      // get the results from each field and build them into the object
+      $('#gollum-dialog-dialog-body input').each(function() {
+        results[$(this).attr('name')] = $(this).val();
+      });
+
+      // pass them to evtOK if it exists (which it should)
+      if ( evtOK &&
+           typeof evtOK == 'function' ) {
+        evtOK( results );
+      }
+      Dialog.hide();
+    },
+
+    hide: function() {
+      if ( $.facebox ) {
+        Dialog.markupCreated = false;
+        $(document).trigger('close.facebox');
+        Dialog.detachEvents();
+      } else {
+        if ( $.browser.msie ) {
+          $('#gollum-dialog-dialog').hide().removeClass('active');
+          $('select').css('visibility', 'visible');
+        } else {
+          $('#gollum-dialog-dialog').animate({ opacity: 0 }, {
             duration: 200,
             complete: function() {
               $('#gollum-dialog-dialog').removeClass('active');
             }
           });
         }
-     },
-   
-     init: function( argObject ) {
-       var title = '';
-       var body = '';
-     
-       // bail out if necessary
-       if ( !argObject || 
-            typeof argObject != 'object' ) {
-         debug('Editor Dialog: Cannot init; invalid init object');
-         return;
-       }
-       
-       if ( argObject.body && typeof argObject.body == 'string' ) {
-         body = '<p>' + argObject.body + '</p>';
-       }
-     
-       // alright, build out fields
-       if ( argObject.fields && typeof argObject.fields == 'object' ) {
-         body += Dialog.createFieldMarkup( argObject.fields );
-       }
-     
-       if ( argObject.title && typeof argObject.title == 'string' ) {
-         title = argObject.title;
-       }
-     
-       if ( Dialog.markupCreated ) {
-         $('#gollum-dialog-dialog').remove();
-       }
-       var $dialog = $( Dialog.createMarkup( title, body ) );
-       $('body').append( $dialog );
-       if ( argObject.OK &&
-            typeof argObject.OK == 'function' ) {
-         Dialog.attachEvents( argObject.OK );
-       }
-       Dialog.show();
-     },
-   
-     show: function() {
-       if ( !Dialog.markupCreated ) {
-         debug('Dialog: No markup to show. Please use init first.');
-       } else {
-         debug('Showing dialog');
+      }
+    },
+
+    init: function( argObject ) {
+      var title = '';
+      var body = '';
+
+      // bail out if necessary
+      if ( !argObject ||
+           typeof argObject != 'object' ) {
+        debug('Editor Dialog: Cannot init; invalid init object');
+        return;
+      }
+
+      if ( argObject.body && typeof argObject.body == 'string' ) {
+        body = '<p>' + argObject.body + '</p>';
+      }
+
+      // alright, build out fields
+      if ( argObject.fields && typeof argObject.fields == 'object' ) {
+        body += Dialog.createFieldMarkup( argObject.fields );
+      }
+
+      if ( argObject.title && typeof argObject.title == 'string' ) {
+        title = argObject.title;
+      }
+
+      if ( Dialog.markupCreated ) {
+        if ($.facebox) {
+          $(document).trigger('close.facebox');
+        } else {
+          $('#gollum-dialog-dialog').remove();
+        }
+      }
+
+      Dialog.markup = Dialog.createMarkup( title, body );
+
+      if ($.facebox) {
+        $(document).bind('reveal.facebox', function() {
+          if ( argObject.OK &&
+               typeof argObject.OK == 'function' ) {
+            Dialog.attachEvents( argObject.OK );
+            $($('#facebox input[type="text"]').get(0)).focus();
+          }
+        });
+      } else {
+        $('body').append( Dialog.markup );
+        if ( argObject.OK &&
+             typeof argObject.OK == 'function' ) {
+          Dialog.attachEvents( argObject.OK );
+        }
+      }
+
+      Dialog.show();
+    },
+
+    show: function() {
+      if ( !Dialog.markupCreated ) {
+        debug('Dialog: No markup to show. Please use init first.');
+      } else {
+        debug('Showing dialog');
+        if ($.facebox) {
+          $.facebox( Dialog.markup );
+        } else {
           if ( $.browser.msie ) {
             $('#gollum-dialog.dialog').addClass('active');
             Dialog.position();
-            $('select').css('visibility', 'hidden'); 
+            $('select').css('visibility', 'hidden');
           } else {
             $('#gollum-dialog.dialog').css('display', 'none');
             $('#gollum-dialog-dialog').animate({ opacity: 0 }, {
@@ -177,30 +228,36 @@
                 $('#gollum-dialog-dialog').css('display', 'block');
                 Dialog.position(); // position this thing
                 $('#gollum-dialog-dialog').animate({ opacity: 1 }, {
-                  duration: 500
+                duration: 500
                 });
               }
             });
           }
-       }
-     },
-   
-     position: function() {
-       var dialogHeight = $('#gollum-dialog-dialog-inner').height();
-       $('#gollum-dialog-dialog-inner')
-         .css('height', dialogHeight + 'px')
-         .css('margin-top', -1 * parseInt( dialogHeight / 2 )); 
-     }
-   
-  }; 
-  
+        }
+      }
+    },
+
+    position: function() {
+      var dialogHeight = $('#gollum-dialog-dialog-inner').height();
+      $('#gollum-dialog-dialog-inner')
+        .css('height', dialogHeight + 'px')
+        .css('margin-top', -1 * parseInt( dialogHeight / 2 ));
+    }
+  };
+
+  if ($.facebox) {
+    $(document).bind('reveal.facebox', function() {
+      $('#facebox img.close_image').remove();
+    });
+  }
+
   var debug = function(m) {
     if ( Dialog.debugOn
          && typeof console != 'undefined' ) {
       console.log( m );
     }
   };
-  
+
   $.GollumDialog = Dialog;
- 
-})(jQuery);
+
+})(jQuery);