ajax_scaffold_plugin 3.2.3 → 3.2.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+
+3.2.4 ========
+
+* Patched rico_corner.js to no longer touch Object.prototype.extend which was causing the new version of
+  Prototype (1.5.0) to choke on making Ajax requests, quite unfortunate. This is a re-patch of the problem
+  we thought we fixed in 3.2.3.
+
 3.2.3 ========
 
 * Fixed clash between Rico and Prototype

data/app/views/ajax_scaffold/_column_totals.rhtml

@@ -1,10 +1,10 @@
-<tr class="ajax-scaffold-totals">
-	<% for scaffold_column in @scaffold_columns %>
-  		<td>
-     		<% if show_totals_for_column?(scaffold_column.name) %><p><%= scaffold_column.total %></p><% else %>&nbsp;<% end %>
-  		</td>
-	<% end %>
-  	<% unless @no_edit && @no_delete %>
-		<td class="actions">&nbsp;</td>
-	<% end %>
+<tr class="ajax-scaffold-totals">
+	<% for scaffold_column in @scaffold_columns %>
+  		<td>
+     		<% if show_totals_for_column?(scaffold_column.name) %><p><%= scaffold_column.total %></p><% else %>&nbsp;<% end %>
+  		</td>
+	<% end %>
+  	<% unless @no_edit && @no_delete %>
+		<td class="actions">&nbsp;</td>
+	<% end %>
 </tr>

data/public/javascripts/ajax_scaffold.js

@@ -1,23 +1,23 @@
-/*  
+/*
  AjaxScaffoldGenerator version 3.1.0
  (c) 2006 Richard White <rrwhite@gmail.com>
- 
+
  AjaxScaffoldGenerator is freely distributable under the terms of an MIT-style license.
- 
+
  For details, see the AjaxScaffoldGenerator web site: http://www.ajaxscaffold.com/
 */
 
 /*
  * The following is a cross browser way to move around <tr> elements in a <table> or <tbody>
  */
- 
+
 var Abstract = new Object();
 Abstract.Table = function() {};
 Abstract.Table.prototype = {
   tagTest: function(element, tagName) {
     return $(element).tagName.toLowerCase() == tagName.toLowerCase();
-  }		
-};	
+  }
+};
 
 Abstract.TableRow = function() {};
 Abstract.TableRow.prototype = Object.extend(new Abstract.Table(), {
@@ -25,14 +25,14 @@ Abstract.TableRow.prototype = Object.extend(new Abstract.Table(), {
     try {
       var sourceTableRow = $(sourceTableRow);
       var targetTableRow = $(targetTableRow);
-      
-      if (targetTableRow == null || !this.tagTest(targetTableRow,'tr') 
+
+      if (targetTableRow == null || !this.tagTest(targetTableRow,'tr')
       	|| sourceTableRow == null || !this.tagTest(sourceTableRow,'tr')) {
         throw("TableRow: both parameters must be a <tr> tag.");
       }
-      
+
       var tableOrTbody = this.findParentTableOrTbody(targetTableRow);
-      
+
       var newRow = tableOrTbody.insertRow(this.getNewRowIndex(targetTableRow) - this.getRowOffset(tableOrTbody));
       newRow.parentNode.replaceChild(sourceTableRow, newRow);
 
@@ -42,7 +42,7 @@ Abstract.TableRow.prototype = Object.extend(new Abstract.Table(), {
   },
   getRowOffset: function(tableOrTbody) {
     //If we are inserting into a tablebody we would need figure out the rowIndex of the first
-    // row in that tbody and subtract that offset from the new row index  
+    // row in that tbody and subtract that offset from the new row index
     var rowOffset = 0;
     if (this.tagTest(tableOrTbody,'tbody')) {
       rowOffset = tableOrTbody.rows[0].rowIndex;
@@ -62,7 +62,7 @@ Abstract.TableRow.prototype = Object.extend(new Abstract.Table(), {
       }
       currentSearchDepth++;
     }
-  }		
+  }
 });
 
 var TableRow = new Object();
@@ -84,20 +84,20 @@ TableRow.MoveAfter.prototype = Object.extend(new Abstract.TableRow(), {
 /*
  * The following are simple utility methods
  */
- 
-var AjaxScaffold = {  
+
+var AjaxScaffold = {
   stripe: function(tableBody) {
     var even = false;
     var tableBody = $(tableBody);
     var tableRows = tableBody.getElementsByTagName("tr");
     var length = tableBody.rows.length;
-      
+
     for (var i = 0; i < length; i++) {
       var tableRow = tableBody.rows[i];
       //Make sure to skip rows that are create or edit rows or messages
-      if (!Element.hasClassName(tableRow, "create") 
+      if (!Element.hasClassName(tableRow, "create")
         && !Element.hasClassName(tableRow, "update")) {
-      	
+
         if (even) {
           Element.addClassName(tableRow, "even");
         } else {
@@ -123,44 +123,4 @@ var AjaxScaffold = {
       Element.removeClassName(element, "desc");
     });
   }
-}
-
-Ajax.Request.prototype = Object.extend(new Ajax.Request(), {
-	setRequestHeaders: function() {
-	  var headers = {
-	    'X-Requested-With': 'XMLHttpRequest',
-	    'X-Prototype-Version': Prototype.Version,
-	    'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-	  };
-
-	  if (this.method == 'post') {
-	    headers['Content-type'] = this.options.contentType +
-	      (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
-	    /* Force "Connection: close" for older Mozilla browsers to work
-	     * around a bug where XMLHttpRequest sends an incorrect
-	     * Content-length header. See Mozilla Bugzilla #246651.
-	     */
-	    if (this.transport.overrideMimeType &&
-	        (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
-	          headers['Connection'] = 'close';
-	  }
-
-	  // user-defined headers
-	  if (typeof this.options.requestHeaders == 'object') {
-	    var extras = this.options.requestHeaders;
-
-	    if (typeof extras.push == 'function')
-	      for (var i = 0, length = extras.length; i < length; i += 2)
-	        headers[extras[i]] = extras[i+1];
-	    else
-	      $H(extras).each(function(pair) { headers[pair.key] = pair.value });
-	  }
-
-	  for( var name in headers ) {
-			if( typeof( headers[name] ) != 'function' ) {
-				this.transport.setRequestHeader(name, headers[name]);
-			}
-		}
-	}
-});
+}

data/public/javascripts/rico_corner.js

@@ -117,9 +117,9 @@ Rico.Color.prototype = {
 
 Rico.Color.createFromHex = function(hexCode) {
   if(hexCode.length==4) {
-    var shortHexCode = hexCode; 
+    var shortHexCode = hexCode;
     var hexCode = '#';
-    for(var i=1;i<4;i++) hexCode += (shortHexCode.charAt(i) + 
+    for(var i=1;i<4;i++) hexCode += (shortHexCode.charAt(i) +
 shortHexCode.charAt(i));
   }
    if ( hexCode.indexOf('#') == 0 )
@@ -484,6 +484,11 @@ Rico.Corner = {
 
 //-------------------- ricoUtil.js
 Rico.ArrayExtensions = new Array();
+/*
+  rrwhite 1.25.2007 - Removing this since it conflicts with the new version of
+  Prototype (1.5.0) and effectively kills all AJAX calls (bummer). This call
+  appears to be something that only the larger Rico library needs and doesn't
+  need to be in the corners abstraction at all.
 
 if (Object.prototype.extend) {
    // in prototype.js...
@@ -494,6 +499,7 @@ if (Object.prototype.extend) {
   }
   Rico.ArrayExtensions[ Rico.ArrayExtensions.length ] = Object.prototype.extend;
 }
+*/
 
 if (Array.prototype.push) {
    // in prototype.js...
@@ -635,7 +641,7 @@ var RicoUtil = {
    },
 
    getContentAsString: function( parentNode ) {
-      return parentNode.xml != undefined ? 
+      return parentNode.xml != undefined ?
          this._getContentAsStringIE(parentNode) :
          this._getContentAsStringMozilla(parentNode);
    },

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajax_scaffold_plugin
 version: !ruby/object:Gem::Version 
-  version: 3.2.3
-date: 2007-01-23 00:00:00 +00:00
+  version: 3.2.4
+date: 2007-01-25 00:00:00 -08:00
 summary: Ajax Scaffold plugin is a rails plugin for ajaxified scaffolds
 require_paths: 
 - lib
@@ -36,14 +36,6 @@ files:
 - app/
 - app/views
 - app/views/ajax_scaffold
-- app/views/ajax_scaffold/update.rjs
-- app/views/ajax_scaffold/table.rhtml
-- app/views/ajax_scaffold/new.rjs
-- app/views/ajax_scaffold/list.rhtml
-- app/views/ajax_scaffold/edit.rjs
-- app/views/ajax_scaffold/destroy.rjs
-- app/views/ajax_scaffold/create.rjs
-- app/views/ajax_scaffold/cancel.rjs
 - app/views/ajax_scaffold/_row.rhtml
 - app/views/ajax_scaffold/_pagination_links.rhtml
 - app/views/ajax_scaffold/_new_edit.rhtml
@@ -52,8 +44,14 @@ files:
 - app/views/ajax_scaffold/_form.rhtml
 - app/views/ajax_scaffold/_column_totals.rhtml
 - app/views/ajax_scaffold/_column_headings.rhtml
-- app/views/.DS_Store
-- app/.DS_Store
+- app/views/ajax_scaffold/update.rjs
+- app/views/ajax_scaffold/table.rhtml
+- app/views/ajax_scaffold/new.rjs
+- app/views/ajax_scaffold/list.rhtml
+- app/views/ajax_scaffold/edit.rjs
+- app/views/ajax_scaffold/destroy.rjs
+- app/views/ajax_scaffold/create.rjs
+- app/views/ajax_scaffold/cancel.rjs
 - lib/
 - lib/base
 - lib/base/ajax_scaffold.rb
@@ -71,9 +69,7 @@ files:
 - public/images/arrow_up.gif
 - public/images/arrow_down.gif
 - public/images/add.gif
-- public/images/.DS_Store
 - public/blank.html
-- public/.DS_Store
 - tasks/
 - tasks/ajax_scaffold_tasks.rake
 - test/