Remove underscore and return early

Author: dancgray

frontend/src/core/helpers.js

@@ -345,22 +345,21 @@ define(function(require){
     },
 
     flattenNestedProperties: function(properties) {
+      if (!properties) return {};
       var flatProperties = {};
-      if (typeof properties !== 'undefined') {
-        for (var key in properties) {
-          // Check for nested properties
-          if (typeof properties[key] === 'object') {
-            for (var innerKey in properties[key]) {
-              // Check if key already exists
-              if (flatProperties[innerKey]) {
-                flatProperties[key+'.'+innerKey] = properties[key][innerKey];
-              } else {
-                flatProperties[innerKey] = properties[key][innerKey];
-              }
+      for (var key in properties) {
+        // Check for nested properties
+        if (typeof properties[key] === 'object') {
+          for (var innerKey in properties[key]) {
+            // Check if key already exists
+            if (flatProperties[innerKey]) {
+              flatProperties[key+'.'+innerKey] = properties[key][innerKey];
+            } else {
+              flatProperties[innerKey] = properties[key][innerKey];
             }
-          } else {
-            flatProperties[key] = properties[key];
           }
+        } else {
+          flatProperties[key] = properties[key];
         }
       }
       return flatProperties;

frontend/src/modules/scaffold/views/scaffoldListView.js

@@ -97,35 +97,35 @@ define([
       var flatItem = Helpers.flattenNestedProperties(this.editor.value);
       var itemValues = _.values(flatItem);
       var parentAttributes = Origin.scaffold.getCurrentModel().attributes;
-      _.each(itemValues, function(item) {
-        if (typeof item === 'string' && item.indexOf('course/assets') !== -1) {
-          var itemFileName = item.substring(item.lastIndexOf('/')+1);
-          $.ajax({
-            url: 'api/asset/query',
-            type:'GET',
-            data: {search: { filename: itemFileName }},
-            success: function (result) {
-              (new CourseAssetModel()).save({
-                _courseId : Origin.editor.data.course.get('_id'),
-                _contentType : parentAttributes._type,
-                _contentTypeId : parentAttributes._id,
-                _fieldName : itemFileName,
-                _assetId : result[0]._id,
-                _contentTypeParentId: parentAttributes._parentId
-              }, {
-                error: function(error) {
-                  Origin.Notify.alert({
-                    type: 'error',
-                    text: Origin.l10n.t('app.errorsaveasset')
-                  });
-                }
-              });
-            },
-            error: function() {
-              Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorduplication') });
-            }
-          });
-        }
+      itemValues.forEach(function(item) {
+        if (typeof item !== 'string' || item.indexOf('course/assets') === -1) return;
+
+        var itemFileName = item.substring(item.lastIndexOf('/')+1);
+        $.ajax({
+          url: 'api/asset/query',
+          type:'GET',
+          data: {search: { filename: itemFileName }},
+          success: function (result) {
+            (new CourseAssetModel()).save({
+              _courseId : Origin.editor.data.course.get('_id'),
+              _contentType : parentAttributes._type,
+              _contentTypeId : parentAttributes._id,
+              _fieldName : itemFileName,
+              _assetId : result[0]._id,
+              _contentTypeParentId: parentAttributes._parentId
+            }, {
+              error: function(error) {
+                Origin.Notify.alert({
+                  type: 'error',
+                  text: Origin.l10n.t('app.errorsaveasset')
+                });
+              }
+            });
+          },
+          error: function() {
+            Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorduplication') });
+          }
+        });
       });
 
       this.list.addItem(this.editor.value, true);