From 88fba61a787c37067b84c85c0db6cea034bf3bc8 Mon Sep 17 00:00:00 2001
From: flynsarmy <flynsarmy@gmail.com>
Date: Wed, 30 Jul 2014 15:17:28 +1000
Subject: [PATCH] Prioritize sourceHandler over dataLocker

---
 modules/backend/widgets/grid/assets/js/datagrid.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/backend/widgets/grid/assets/js/datagrid.js b/modules/backend/widgets/grid/assets/js/datagrid.js
index 6a12550bd..4bc799640 100644
--- a/modules/backend/widgets/grid/assets/js/datagrid.js
+++ b/modules/backend/widgets/grid/assets/js/datagrid.js
@@ -73,6 +73,12 @@
         if (this.options.data) {
             handsontableOptions.data = this.options.data
         }
+        /*
+         * Data from an AJAX data source
+         */
+        else if (this.options.sourceHandler) {
+            self.refreshDataSource()
+        }
         /*
          * Data from a data locker
          */
@@ -96,12 +102,6 @@
                 delete handsontableOptions.data
             }
         }
-        /*
-         * Data from an AJAX data source
-         */
-        else if (this.options.sourceHandler) {
-            self.refreshDataSource()
-        }
 
         /*
          * Monitor for data changes
@@ -454,4 +454,4 @@
     Handsontable.PluginHooks.add('afterUpdateSettings', function () {
         init.call(this)
     });
-})(Handsontable, jQuery);
\ No newline at end of file
+})(Handsontable, jQuery);