Much progress, nearly functional againorigin/AMD_restructure

2 files changed, 10 insertions, 5 deletions

diff --git a/javascripts/libs/ddl_builder.js b/javascripts/libs/ddl_builder.js
index c2cf33e..12718dd 100644
--- a/javascripts/libs/ddl_builder.js
+++ b/javascripts/libs/ddl_builder.js
@@ -1,4 +1,5 @@
-	
+define(["jQuery", "Handlebars", "DateFormat"], function ($, Handlebars, dateFormat) {
+
 	ddl_builder = function (args) {
 
 		// output settings
@@ -389,3 +390,7 @@ VALUES\n\
 	ddl_builder.prototype.render = function () {
 		return this.compiledTemplate($.extend(this.definition, {"separator": this.statement_separator}));		
 	}
+	
+	return ddl_builder;
+	
+});	
diff --git a/javascripts/libs/fiddleEditor.js b/javascripts/libs/fiddleEditor.js
index 7f2f2f8..2138a2e 100644
--- a/javascripts/libs/fiddleEditor.js
+++ b/javascripts/libs/fiddleEditor.js
@@ -1,6 +1,6 @@
 define(["CodeMirror", "MySQLCodeMirror"], function (CodeMirror, myMode){ 
 	
-	var fiddleEditor = function (domID, changeHandler) {
+	var fiddleEditor = function (domID, changeHandler, viewRef) {
 		this.codeMirrorSupported = !( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) );
 		
 		if (this.codeMirrorSupported)
@@ -8,13 +8,13 @@ define(["CodeMirror", "MySQLCodeMirror"], function (CodeMirror, myMode){
 		        mode: "mysql",
 				extraKeys: {Tab: "indentMore"},
 		        lineNumbers: true,
-		        onChange: changeHandler
+		        onChange: function(){ changeHandler.call(viewRef) }
 		      });			
 		else
 		{
 			this.textArea = document.getElementById(domID);
-			$(this.textArea).on('change', changeHandler);
-			$(this.textArea).on('keyup', changeHandler);
+			$(this.textArea).on('change', function(){ changeHandler.call(viewRef) });
+			$(this.textArea).on('keyup', function(){ changeHandler.call(viewRef) });
 			$(this.textArea).attr('fullscreen',false);
 		}