fix syntax

TaiBIF · Nov 20, 2018 · ac2cb3f · ac2cb3f
1 parent cc42118
commit ac2cb3f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/common/mixins/accessControl.js b/common/mixins/accessControl.js
@@ -279,8 +279,7 @@ module.exports = function(Model, options) {
                       for (const loc_id in uniqueLocationMd5Projects) {
                         if (uniqueLocationMd5Projects.hasOwnProperty(loc_id)) {
                           uniqueLocationMd5s.push({loc_id, projectTitle: uniqueLocationMd5Projects[loc_id]});
-                        });
-                      }
+                        }
                       }
 
                       // usage example:
@@ -329,9 +328,8 @@ module.exports = function(Model, options) {
 
                             });
 
-                          });
-                      });
-                      else {
+                        });
+                      } else {
                         next();
                       }
                       break;

diff --git a/common/mixins/bulkNormalize.js b/common/mixins/bulkNormalize.js
@@ -319,13 +319,7 @@ let prefixParts = Model.definition.name,
             defaultValue = defProps[propName].default;
           }
 
-          if (instance[propName] === undefined)
-            instance[propName] =
-              defaultValue !== undefined
-                ? defaultValue
-                : typeof defaultFn === 'function'
-                  defaultFn() :
-                  undefined;
+          if (instance[propName] === undefined) instance[propName] = ((defaultValue !== undefined) ? defaultValue : ((typeof defaultFn === 'function') ? defaultFn() : undefined)); 
 
           // console.log("XXXXXXXXXXXXXXXX " + defProps[propName]);
         }

diff --git a/common/models/multimedia-annotation.js b/common/models/multimedia-annotation.js
@@ -336,8 +336,8 @@ module.exports = function(MultimediaAnnotation) {
           else {
             callback(null, null);
           }
-        },
-
+        }
+      );
 
     });
   };