Using AngularJS helper functions angular.isFunction angular.isString

dtpublic · Aug 6, 2014 · 74e2f1a · 74e2f1a
1 parent 5c541a6
commit 74e2f1a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/dist/angular-ui-dashboard.js b/dist/angular-ui-dashboard.js
@@ -458,15 +458,15 @@ angular.module('ui.dashboard')
       link: function (scope) {
 
         var widget = scope.widget;
+        var dataModelType = widget.dataModelType;
         // set up data source
-        if (widget.dataModelType) {
+        if (dataModelType) {
           var DataModelConstructor; // data model constructor function
 
-          var type = typeof widget.dataModelType;
-          if (type === 'function') {
-            DataModelConstructor = widget.dataModelType;
-          } else if (type === 'string') {
-            $injector.invoke([widget.dataModelType, function (DataModelType) {
+          if (angular.isFunction(dataModelType)) {
+            DataModelConstructor = dataModelType;
+          } else if (angular.isString(dataModelType)) {
+            $injector.invoke([dataModelType, function (DataModelType) {
               DataModelConstructor = DataModelType;
             }]);
           } else {

diff --git a/src/directives/widget.js b/src/directives/widget.js
@@ -26,15 +26,16 @@ angular.module('ui.dashboard')
       link: function (scope) {
 
         var widget = scope.widget;
+        var dataModelType = widget.dataModelType;
+
         // set up data source
-        if (widget.dataModelType) {
+        if (dataModelType) {
           var DataModelConstructor; // data model constructor function
 
-          var type = typeof widget.dataModelType;
-          if (type === 'function') {
-            DataModelConstructor = widget.dataModelType;
-          } else if (type === 'string') {
-            $injector.invoke([widget.dataModelType, function (DataModelType) {
+          if (angular.isFunction(dataModelType)) {
+            DataModelConstructor = dataModelType;
+          } else if (angular.isString(dataModelType)) {
+            $injector.invoke([dataModelType, function (DataModelType) {
               DataModelConstructor = DataModelType;
             }]);
           } else {