muck-engine 0.4.17 → 0.4.21

data/VERSION

@@ -1 +1 @@
-0.4.17
+0.4.21

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.4.17"
+  s.version = "0.4.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-04-08}
   s.description = %q{The base engine for the muck system.  Contains common tables, custom for, css and javascript.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -556,6 +556,7 @@ Gem::Specification.new do |s|
      "public/javascripts/jquery/jquery.tips.js",
      "public/javascripts/jquery/jrails.js",
      "public/javascripts/muck-countries.js",
+     "public/javascripts/muck-src.js",
      "public/javascripts/muck.js",
      "public/javascripts/muck_time/en.js",
      "public/javascripts/tree.js",

data/public/javascripts/jquery/jquery.form.js

@@ -1,7 +1,7 @@
-/*
+/*!
  * jQuery Form Plugin
- * version: 2.36 (07-NOV-2009)
- * @requires jQuery v1.2.6 or later
+ * version: 2.43 (12-MAR-2010)
+ * @requires jQuery v1.3.2 or later
  *
  * Examples and documentation at: http://malsup.com/jquery/form/
  * Dual licensed under the MIT and GPL licenses:
@@ -124,15 +124,16 @@ $.fn.ajaxSubmit = function(options) {
 	if (!options.dataType && options.target) {
 		var oldSuccess = options.success || function(){};
 		callbacks.push(function(data) {
-			$(options.target).html(data).each(oldSuccess, arguments);
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
 		});
 	}
 	else if (options.success)
 		callbacks.push(options.success);
 
-	options.success = function(data, status) {
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
 		for (var i=0, max=callbacks.length; i < max; i++)
-			callbacks[i].apply(options, [data, status, $form]);
+			callbacks[i].apply(options, [data, status, xhr || $form, $form]);
 	};
 
 	// are there files to upload?
@@ -177,7 +178,7 @@ $.fn.ajaxSubmit = function(options) {
 		var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
 
 		var id = 'jqFormIO' + (new Date().getTime());
-		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ opts.iframeSrc +'" />');
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ opts.iframeSrc +'" onload="(jQuery(this).data(\'form-plugin-onload\'))()" />');
 		var io = $io[0];
 
 		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
@@ -209,7 +210,7 @@ $.fn.ajaxSubmit = function(options) {
 		if (xhr.aborted)
 			return;
 
-		var cbInvoked = 0;
+		var cbInvoked = false;
 		var timedOut = 0;
 
 		// add submitting element to data if we know it
@@ -217,17 +218,17 @@ $.fn.ajaxSubmit = function(options) {
 		if (sub) {
 			var n = sub.name;
 			if (n && !sub.disabled) {
-				options.extraData = options.extraData || {};
-				options.extraData[n] = sub.value;
+				opts.extraData = opts.extraData || {};
+				opts.extraData[n] = sub.value;
 				if (sub.type == "image") {
-					options.extraData[name+'.x'] = form.clk_x;
-					options.extraData[name+'.y'] = form.clk_y;
+					opts.extraData[n+'.x'] = form.clk_x;
+					opts.extraData[n+'.y'] = form.clk_y;
 				}
 			}
 		}
 
 		// take a breath so that pending repaints get some cpu time before the upload starts
-		setTimeout(function() {
+		function doSubmit() {
 			// make sure form attrs are set
 			var t = $form.attr('target'), a = $form.attr('action');
 
@@ -239,7 +240,7 @@ $.fn.ajaxSubmit = function(options) {
 				form.setAttribute('action', opts.url);
 
 			// ie borks in some cases when setting encoding
-			if (! options.skipEncodingOverride) {
+			if (! opts.skipEncodingOverride) {
 				$form.attr({
 					encoding: 'multipart/form-data',
 					enctype:  'multipart/form-data'
@@ -253,15 +254,15 @@ $.fn.ajaxSubmit = function(options) {
 			// add "extra" data to form if provided in options
 			var extraInputs = [];
 			try {
-				if (options.extraData)
-					for (var n in options.extraData)
+				if (opts.extraData)
+					for (var n in opts.extraData)
 						extraInputs.push(
-							$('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
+							$('<input type="hidden" name="'+n+'" value="'+opts.extraData[n]+'" />')
 								.appendTo(form)[0]);
 
 				// add iframe to doc and submit the form
 				$io.appendTo('body');
-				io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+				$io.data('form-plugin-onload', cb);
 				form.submit();
 			}
 			finally {
@@ -270,14 +271,18 @@ $.fn.ajaxSubmit = function(options) {
 				t ? form.setAttribute('target', t) : $form.removeAttr('target');
 				$(extraInputs).remove();
 			}
-		}, 10);
+		};
 
-		var domCheckCount = 50;
+		if (opts.forceSync)
+			doSubmit();
+		else
+			setTimeout(doSubmit, 10); // this lets dom updates render
+	
+		var domCheckCount = 100;
 
 		function cb() {
-			if (cbInvoked++) return;
-
-			io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+			if (cbInvoked) 
+				return;
 
 			var ok = true;
 			try {
@@ -293,14 +298,16 @@ $.fn.ajaxSubmit = function(options) {
 				 	if (--domCheckCount) {
 						// in some browsers (Opera) the iframe DOM is not always traversable when
 						// the onload callback fires, so we loop a bit to accommodate
-						cbInvoked = 0;
-						setTimeout(cb, 100);
+				 		log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
 						return;
 					}
-					log('Could not access iframe DOM after 50 tries.');
+					log('Could not access iframe DOM after 100 tries.');
 					return;
 				}
 
+				log('response detected');
+				cbInvoked = true;
 				xhr.responseText = doc.body ? doc.body.innerHTML : null;
 				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
 				xhr.getResponseHeader = function(header){
@@ -326,7 +333,9 @@ $.fn.ajaxSubmit = function(options) {
 				data = $.httpData(xhr, opts.dataType);
 			}
 			catch(e){
+				log('error caught:',e);
 				ok = false;
+				xhr.error = e;
 				$.handleError(opts, xhr, 'error', e);
 			}
 
@@ -341,6 +350,7 @@ $.fn.ajaxSubmit = function(options) {
 
 			// clean up
 			setTimeout(function() {
+				$io.removeData('form-plugin-onload');
 				$io.remove();
 				xhr.responseXML = null;
 			}, 100);
@@ -375,9 +385,9 @@ $.fn.ajaxSubmit = function(options) {
  * the form itself.
  */
 $.fn.ajaxForm = function(options) {
-	return this.ajaxFormUnbind().bind('submit.form-plugin', function() {
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		e.preventDefault();
 		$(this).ajaxSubmit(options);
-		return false;
 	}).bind('click.form-plugin', function(e) {
 		var target = e.target;
 		var $el = $(target);
@@ -653,8 +663,13 @@ $.fn.selected = function(select) {
 // helper fn for console logging
 // set $.fn.ajaxSubmit.debug to true to enable debug logging
 function log() {
-	if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
-		window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
+	if ($.fn.ajaxSubmit.debug) {
+		var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+		if (window.console && window.console.log)
+			window.console.log(msg);
+		else if (window.opera && window.opera.postError)
+			window.opera.postError(msg);
+	}
 };
 
 })(jQuery);

data/public/javascripts/muck-src.js

@@ -0,0 +1,134 @@
+// compress with http://closure-compiler.appspot.com/home
+//jQuery.noConflict();
+jQuery(document).ajaxSend(function(event, request, settings) {
+  add_headers(request);
+  if (settings.type.toUpperCase() == 'GET' || typeof(AUTH_TOKEN) == "undefined") return; // for details see: http://www.justinball.com/2009/07/08/jquery-ajax-get-in-firefox-post-in-internet-explorer/
+  // settings.data is a serialized string like "foo=bar&baz=boink" (or null)
+  settings.data = settings.data || "";
+ 	if (typeof(AUTH_TOKEN) != "undefined")
+  	settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
+});
+
+function apply_ajax_forms() {
+  jQuery('form.ajax').ajaxForm({
+    dataType: 'script',
+    beforeSend: add_headers
+  });
+	jQuery('form.ajax').append('<input type="hidden" name="format" value="js" />');
+}
+
+function add_headers(xhr){
+	xhr.setRequestHeader("Accept", "text/javascript");
+	xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+}
+
+jQuery(document).ready(function() {
+
+  jQuery('a.ajax-delete').live('click', function() {
+    var title = jQuery(this).attr('title');
+    var do_delete = true;
+    if(title.length > 0){
+      do_delete = confirm(title);
+    }
+    if (do_delete){
+      jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
+    }
+    return false;
+  });
+
+  jQuery('a.ajax-update').live('click', function() {
+    jQuery.post(this.href, { _method: 'put', format: 'js' }, null, "script");
+    return false;
+  });
+
+  jQuery(".submit-form").click(function() {
+    jQuery(this).parent('form').submit();
+  });
+
+  apply_ajax_forms();
+
+  jQuery('a.dialog-pop').live('click', function() {
+    var d = jQuery('<div class="dialog"></div>').appendTo("body");
+    d.dialog({ modal: true, autoOpen: false, width: 'auto', title: jQuery(this).attr('title') });
+    d.load(jQuery(this).attr('href'), '', function(){
+      d.dialog("open");
+      apply_ajax_forms();
+    });
+    return false;
+  });
+
+  jQuery(".submit-delete").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.json', form.serialize(),
+      function(data){
+        var json = eval('(' + data + ')');
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        }
+      });
+    return false;
+  });
+  
+  jQuery(".submit-delete-js").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.js', form.serialize(),
+      function(data){
+      });
+    return false;
+  });
+
+  jQuery(document).ready(function() {
+    jQuery('.waiting').hide();
+    jQuery(".wait-button").live('click', function() {
+      jQuery(this).siblings('.waiting').show();
+      jQuery(this).hide();
+    });
+  });
+
+});
+
+// String list methods. These are handy for dealing with comma delimited lists
+// in text boxes such as a list of emails or tags.
+// Given a comma delimited string add a new item if it isn't in the string
+function add_to_list(items_string, new_item){
+  var items = split_list(items_string);
+  var add = true;
+  for(i=0;i<items.length;i++){
+    if(items[i] == new_item){ add = false; }
+  }
+  if(add){ 
+    items.push(new_item);
+  }
+  return items.join(', ');
+}
+
+// Given a comma delimited list remove an item from the string
+function remove_from_list(items_string, remove_item){
+  var items = split_list(items_string);
+  var cleaned = [];
+  for(i=0;i<items.length;i++){
+    if(items[i] != remove_item){
+      cleaned.push(items[i]);
+    }
+  }
+  return cleaned.join(', ');
+}
+
+// Split a string on commas
+function split_list(items_string){
+  if(undefined != items_string && items_string.length > 0){
+    var items = items_string.split(',');
+  } else {
+    var items = [];
+  }
+  var cleaned = [];
+  for(i=0;i<items.length;i++){
+    var cleaned_item = items[i].split(" ").join("");
+    if(cleaned_item.length > 0){ 
+      cleaned.push(cleaned_item); 
+    }
+  }
+  return cleaned;
+}

data/public/javascripts/muck.js

@@ -1,89 +1,6 @@
-//jQuery.noConflict();
-jQuery(document).ajaxSend(function(event, request, settings) {
-  add_headers(request);
-  if (settings.type.toUpperCase() == 'GET' || typeof(AUTH_TOKEN) == "undefined") return; // for details see: http://www.justinball.com/2009/07/08/jquery-ajax-get-in-firefox-post-in-internet-explorer/
-  // settings.data is a serialized string like "foo=bar&baz=boink" (or null)
-  settings.data = settings.data || "";
- 	if (typeof(AUTH_TOKEN) != "undefined")
-  	settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
-});
-
-function apply_ajax_forms() {
-  jQuery('form.ajax').ajaxForm({
-    dataType: 'script',
-    beforeSend: add_headers
-  });
-	jQuery('form.ajax').append('<input type="hidden" name="format" value="js" />');
-}
-
-function add_headers(xhr){
-	xhr.setRequestHeader("Accept", "text/javascript");
-	xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-}
-
-jQuery(document).ready(function() {
-
-  jQuery('a.ajax-delete').live('click', function() {
-    var title = jQuery(this).attr('title');
-    var do_delete = true;
-    if(title.length > 0){
-      do_delete = confirm(title);
-    }
-    if (do_delete){
-      jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
-    }
-    return false;
-  });
-
-  jQuery('a.ajax-update').live('click', function() {
-    jQuery.post(this.href, { _method: 'put', format: 'js' }, null, "script");
-    return false;
-  });
-
-  jQuery(".submit-form").click(function() {
-    jQuery(this).parent('form').submit();
-  });
-
-  apply_ajax_forms();
-
-  jQuery('a.dialog-pop').live('click', function() {
-    var d = jQuery('<div class="dialog"></div>').appendTo("body");
-    d.dialog({ modal: true, autoOpen: false, width: 'auto', title: jQuery(this).attr('title') });
-    d.load(jQuery(this).attr('href'), '', function(){
-      d.dialog("open");
-      apply_ajax_forms();
-    });
-    return false;
-  });
-
-  jQuery(".submit-delete").live('click', function() {
-    jQuery(this).parents('.delete-container').fadeOut();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action') + '.json', form.serialize(),
-      function(data){
-        var json = eval('(' + data + ')');
-        if(!json.success){
-          jQuery.jGrowl.info(json.message);
-        }
-      });
-    return false;
-  });
-  
-  jQuery(".submit-delete-js").live('click', function() {
-    jQuery(this).parents('.delete-container').fadeOut();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action') + '.js', form.serialize(),
-      function(data){
-      });
-    return false;
-  });
-
-  jQuery(document).ready(function() {
-    jQuery('.waiting').hide();
-    jQuery(".wait-button").click(function() {
-      jQuery('.waiting').show();
-      jQuery(this).hide();
-    });
-  });
-
-});
+jQuery(document).ajaxSend(function(a,b,c){add_headers(b);if(!(c.type.toUpperCase()=="GET"||typeof AUTH_TOKEN=="undefined")){c.data=c.data||"";if(typeof AUTH_TOKEN!="undefined")c.data+=(c.data?"&":"")+"authenticity_token="+encodeURIComponent(AUTH_TOKEN)}});function apply_ajax_forms(){jQuery("form.ajax").ajaxForm({dataType:"script",beforeSend:add_headers});jQuery("form.ajax").append('<input type="hidden" name="format" value="js" />')}
+function add_headers(a){a.setRequestHeader("Accept","text/javascript");a.setRequestHeader("X-Requested-With","XMLHttpRequest")}
+jQuery(document).ready(function(){jQuery("a.ajax-delete").live("click",function(){var a=jQuery(this).attr("title"),b=true;if(a.length>0)b=confirm(a);b&&jQuery.post(this.href,{_method:"delete",format:"js"},null,"script");return false});jQuery("a.ajax-update").live("click",function(){jQuery.post(this.href,{_method:"put",format:"js"},null,"script");return false});jQuery(".submit-form").click(function(){jQuery(this).parent("form").submit()});apply_ajax_forms();jQuery("a.dialog-pop").live("click",function(){var a=
+jQuery('<div class="dialog"></div>').appendTo("body");a.dialog({modal:true,autoOpen:false,width:"auto",title:jQuery(this).attr("title")});a.load(jQuery(this).attr("href"),"",function(){a.dialog("open");apply_ajax_forms()});return false});jQuery(".submit-delete").live("click",function(){jQuery(this).parents(".delete-container").fadeOut();var a=jQuery(this).parents("form");jQuery.post(a.attr("action")+".json",a.serialize(),function(b){b=eval("("+b+")");b.success||jQuery.jGrowl.info(b.message)});return false});
+jQuery(".submit-delete-js").live("click",function(){jQuery(this).parents(".delete-container").fadeOut();var a=jQuery(this).parents("form");jQuery.post(a.attr("action")+".js",a.serialize(),function(){});return false});jQuery(document).ready(function(){jQuery(".waiting").hide();jQuery(".wait-button").live("click",function(){jQuery(this).siblings(".waiting").show();jQuery(this).hide()})})});
+function add_to_list(a,b){a=split_list(a);var c=true;for(i=0;i<a.length;i++)if(a[i]==b)c=false;c&&a.push(b);return a.join(", ")}function remove_from_list(a,b){a=split_list(a);var c=[];for(i=0;i<a.length;i++)a[i]!=b&&c.push(a[i]);return c.join(", ")}function split_list(a){a=undefined!=a&&a.length>0?a.split(","):[];var b=[];for(i=0;i<a.length;i++){var c=a[i].split(" ").join("");c.length>0&&b.push(c)}return b};

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 17
-  version: 0.4.17
+  - 21
+  version: 0.4.21
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -06:00
+date: 2010-04-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -615,6 +615,7 @@ files:
 - public/javascripts/jquery/jquery.tips.js
 - public/javascripts/jquery/jrails.js
 - public/javascripts/muck-countries.js
+- public/javascripts/muck-src.js
 - public/javascripts/muck.js
 - public/javascripts/muck_time/en.js
 - public/javascripts/tree.js