Merge branch 'master' of https://github.com/gitana/alpaca

Author: mibewh

src/js/fields/advanced/MarkdownField.js

@@ -39,6 +39,44 @@
 
         },
 
+        initMarkdownEditorEvents: function()
+        {
+            var self = this;
+
+            if (self.editor)
+            {
+                self.editor.codemirror.on("change", function(e) {
+                    self.onChange();
+                    self.triggerWithPropagation("change", e);
+                    self.triggerWithPropagation("after_nested_change", e);
+                });
+
+                self.editor.codemirror.on("beforeChange", function(e) {
+                    self.triggerWithPropagation("before_nested_change", e);
+                });
+
+                self.editor.codemirror.on("keyHandled", function(e) {
+                    self.onKeyPress.call(self, e);
+                    self.trigger("keypress", e);
+                });
+
+                self.editor.codemirror.on('blur', function (e) {
+                    self.onBlur();
+                    self.trigger("blur", e);
+                });
+
+                self.editor.codemirror.on("focus", function (e) {
+                    self.onFocus.call(self, e);
+                    self.trigger("focus", e);
+                });
+
+                self.editor.codemirror.on("mousedown", function (e) {
+                    self.onClick.call(self, e);
+                    self.trigger("click", e);
+                });
+            }
+        },
+
         afterRenderControl: function(model, callback)
         {
             var self = this;
@@ -56,6 +94,8 @@
                         {
                             self.editor = new SimpleMDE(self.options.markdown);
                         }
+
+                        self.initMarkdownEditorEvents();
                     });
                 }
 

src/js/fields/basic/ArrayField.js

@@ -1394,6 +1394,9 @@
 
             if (self._validateEqualMaxItems())
             {
+                // propagate up with "before_nested_change"
+                self.triggerWithPropagation("before_nested_change");
+
                 self.createItem(index, schema, options, data, function(item) {
 
                     // register the child
@@ -1417,6 +1420,12 @@
                         // trigger update
                         self.triggerUpdate();
 
+                        self.onChange.call(self);
+                        self.triggerWithPropagation("change");
+
+                        // propagate up with "after_nested_change"
+                        self.triggerWithPropagation("after_nested_change");
+
                         if (callback)
                         {
                             Alpaca.nextTick(function() {
@@ -1463,6 +1472,9 @@
 
             if (this._validateEqualMinItems() || force)
             {
+                // propagate up with "before_nested_change"
+                self.triggerWithPropagation("before_nested_change");
+
                 // unregister the child
                 self.unregisterChild(childIndex);
 
@@ -1484,6 +1496,12 @@
                     // trigger update
                     self.triggerUpdate();
 
+                    self.onChange.call(self);
+                    self.triggerWithPropagation("change");
+
+                    // propagate up with "after_nested_change"
+                    self.triggerWithPropagation("after_nested_change");
+
                     if (callback)
                     {
                         Alpaca.nextTick(function() {
@@ -1558,6 +1576,9 @@
 
             var onComplete = function()
             {
+                // propagate up with "before_nested_change"
+                self.triggerWithPropagation("before_nested_change");
+
                 var adjustedTargetIndex = targetIndex;
                 if (sourceIndex < targetIndex) {
                     adjustedTargetIndex--;
@@ -1584,6 +1605,12 @@
                     // dispatch event: move
                     self.trigger("move");
 
+                    self.onChange.call(self);
+                    self.triggerWithPropagation("change");
+
+                    // propagate up with "after_nested_change"
+                    self.triggerWithPropagation("after_nested_change");
+
                     if (callback)
                     {
                         Alpaca.nextTick(function() {