Merge pull request #1135 from remotestorage/bugfix/1133-max_age_handling_2

Refactor synced GET function

Author: Sebastian Kippe

src/syncedgetputdelete.js

@@ -5,29 +5,27 @@ function shareFirst(path) {
            path.match(/^\/public\/.*[^\/]$/) );
 }
 
-function maxAgeInvalid(maxAge) {
-  return maxAge !== false && typeof(maxAge) !== 'number';
+function defaultMaxAge(context) {
+  if ((typeof context.remote === 'object') &&
+      context.remote.connected && context.remote.online) {
+    return 2 * context.getSyncInterval();
+  } else {
+    log('Not setting default maxAge, because remote is offline or not connected');
+    return false;
+  }
 }
 
 var SyncedGetPutDelete = {
   get: function (path, maxAge) {
-    if (this.local) {
-      if (maxAge === undefined) {
-        if ((typeof this.remote === 'object') &&
-             this.remote.connected && this.remote.online) {
-          maxAge = 2*this.getSyncInterval();
-        } else {
-          log('Not setting default maxAge, because remote is offline or not connected');
-          maxAge = false;
-        }
-      }
-
-      if (maxAgeInvalid(maxAge)) {
-        return Promise.reject('Argument \'maxAge\' must be false or a number');
+    if (!this.local) {
+      return this.remote.get(path);
+    } else {
+      if (typeof maxAge === 'undefined') {
+        maxAge = defaultMaxAge(this);
+      } else if (typeof maxAge !== 'number' && maxAge !== false) {
+        return Promise.reject(`Argument 'maxAge' must be 'false' or a number`);
       }
       return this.local.get(path, maxAge, this.sync.queueGetRequest.bind(this.sync));
-    } else {
-      return this.remote.get(path);
     }
   },