From 415f8a04b243da4dfdbfdd70dcb3807eea6a10ec Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian.mooyman@gmail.com>
Date: Thu, 24 Oct 2013 17:07:29 +1300
Subject: [PATCH] API Change tracker allows explicit dirty messages BUG Fixed
 issue with UploadField not detecting changes

---
 .../lib/jquery.changetracker.js               | 29 ++++++++++++-------
 javascript/UploadField.js                     |  8 +++++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/admin/javascript/jquery-changetracker/lib/jquery.changetracker.js b/admin/javascript/jquery-changetracker/lib/jquery.changetracker.js
index 854668b40..b6e2d22ad 100644
--- a/admin/javascript/jquery-changetracker/lib/jquery.changetracker.js
+++ b/admin/javascript/jquery-changetracker/lib/jquery.changetracker.js
@@ -55,6 +55,9 @@
 			// optional metadata plugin support
 			if ($.meta) options = $.extend({}, options, this.data());
 
+			// Flag indicating this form was dirtied by an external component
+			var dirty = false;
+
 			var onchange = function(e) {
 				var $field = $(e.target);
 				var origVal = $field.data('changetracker.origVal'), newVal;
@@ -76,8 +79,8 @@
 					if($field.is(':radio')) {
 						self.find(':radio[name=' + $field.attr('name') + ']').removeClass(options.changedCssClass);
 					}
-					// Only unset form state if no other fields are changed as well
-					if(!self.getFields().filter('.' + options.changedCssClass).length) {
+					// Only unset form state if no other fields are changed as well and the form isn't explicitly dirty
+					if(!dirty && !self.getFields().filter('.' + options.changedCssClass).length) {
 						self.removeClass(options.changedCssClass);
 					}
 				}
@@ -95,6 +98,11 @@
 				}
 				$(this).data('changetracker.origVal', origVal);
 			});
+			
+			self.bind('dirty.changetracker', function() {
+				dirty = true;
+				self.addClass(options.changedCssClass);
+			});
 
 			this.data('changetracker', true);
 		};
@@ -104,7 +112,8 @@
 				.unbind('.changetracker')
 				.removeClass(options.changedCssClass)
 				.removeData('changetracker.origVal');
-			this.removeData('changetracker');
+			this.unbind('.changetracker')
+				.removeData('changetracker');
 		};
 			
 		/**
@@ -137,13 +146,13 @@
 
 		// Support invoking "public" methods as string arguments
 		if (typeof arguments[0] === 'string') {  
-      var property = arguments[1];  
-      var args = Array.prototype.slice.call(arguments);  
-      args.splice(0, 1);  
-      return this[arguments[0]].apply(this, args);  
-  	} else {
-    	return this.initialize();
-    }
+			var property = arguments[1];  
+			var args = Array.prototype.slice.call(arguments);  
+			args.splice(0, 1);  
+			return this[arguments[0]].apply(this, args);  
+		} else {
+			return this.initialize();
+		}
 		
 	};
 }(jQuery));
\ No newline at end of file
diff --git a/javascript/UploadField.js b/javascript/UploadField.js
index d9400e20d..b8260e34a 100644
--- a/javascript/UploadField.js
+++ b/javascript/UploadField.js
@@ -48,6 +48,11 @@
 
 			return result;
 		},
+		_onDone: function (result, textStatus, jqXHR, options) {
+			// Mark form as dirty on completion of successful upload
+			this.element.closest('form').trigger('dirty');
+			$.blueimpUI.fileupload.prototype._onDone.call(this, result, textStatus, jqXHR, options);
+		},
 		_onSend: function (e, data) {
 			//check the array of existing files to see if we are trying to upload a file that already exists
 			var that = this;
@@ -98,6 +103,7 @@
 			this._adjustMaxNumberOfFiles(0);
 		},
 		attach: function(data) {
+			this.element.closest('form').trigger('dirty');
 
 			// Handles attachment of already uploaded files, similar to add
 			var self = this,
@@ -340,6 +346,7 @@
 				
 				if(this.is('.ss-uploadfield-item-delete')) {
 					if(confirm(ss.i18n._t('UploadField.ConfirmDelete'))) {
+						this.closest('form').trigger('dirty');
 						fileupload._trigger('destroy', e, {
 							context: item,
 							url: this.data('href'),
@@ -349,6 +356,7 @@
 					}
 				} else {
 					// Removed files will be applied to object on save
+					this.closest('form').trigger('dirty');
 					fileupload._trigger('destroy', e, {context: item});	
 				}