Переглянути джерело

core: properly clear cache in `clearSession`

Bump to latest backbone.browserStorage which adds the `clear` method
JC Brand 5 роки тому
батько
коміт
0f63c84d5b
3 змінених файлів з 33 додано та 34 видалено
  1. 25 24
      package-lock.json
  2. 7 9
      src/headless/converse-core.js
  3. 1 1
      src/headless/package.json

+ 25 - 24
package-lock.json

@@ -2994,8 +2994,8 @@
 			}
 		},
 		"backbone.browserStorage": {
-			"version": "github:conversejs/backbone.browserStorage#2d0ceaa2f38eedc60122bb0aa23c826dc37a9194",
-			"from": "github:conversejs/backbone.browserStorage#2d0ceaa2f38eedc60122bb0aa23c826dc37a9194"
+			"version": "github:conversejs/backbone.browserStorage#674ba3aa0e4d0f0b0dcac48fcc7dea531012828f",
+			"from": "github:conversejs/backbone.browserStorage#674ba3aa0e4d0f0b0dcac48fcc7dea531012828f"
 		},
 		"backbone.nativeview": {
 			"version": "github:conversejs/Backbone.NativeView#5997c8197ca594e6b8469447f28310c78bd1d95e",
@@ -14041,10 +14041,13 @@
 			}
 		},
 		"npm-bundled": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
-			"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
-			"dev": true
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+			"integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+			"dev": true,
+			"requires": {
+				"npm-normalize-package-bin": "^1.0.1"
+			}
 		},
 		"npm-lifecycle": {
 			"version": "3.1.4",
@@ -14079,6 +14082,12 @@
 				}
 			}
 		},
+		"npm-normalize-package-bin": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+			"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+			"dev": true
+		},
 		"npm-package-arg": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
@@ -14100,9 +14109,9 @@
 			}
 		},
 		"npm-packlist": {
-			"version": "1.4.6",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz",
-			"integrity": "sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==",
+			"version": "1.4.7",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz",
+			"integrity": "sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==",
 			"dev": true,
 			"requires": {
 				"ignore-walk": "^3.0.1",
@@ -15370,24 +15379,16 @@
 			}
 		},
 		"read-package-json": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz",
-			"integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz",
+			"integrity": "sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==",
 			"dev": true,
 			"requires": {
 				"glob": "^7.1.1",
 				"graceful-fs": "^4.1.2",
 				"json-parse-better-errors": "^1.0.1",
 				"normalize-package-data": "^2.0.0",
-				"slash": "^1.0.0"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-					"dev": true
-				}
+				"npm-normalize-package-bin": "^1.0.0"
 			}
 		},
 		"read-package-tree": {
@@ -17610,9 +17611,9 @@
 			}
 		},
 		"uglify-js": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.1.tgz",
-			"integrity": "sha512-pnOF7jY82wdIhATVn87uUY/FHU+MDUdPLkmGFvGoclQmeu229eTkbG5gjGGBi3R7UuYYSEeYXY/TTY5j2aym2g==",
+			"version": "3.7.2",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz",
+			"integrity": "sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==",
 			"dev": true,
 			"optional": true,
 			"requires": {

+ 7 - 9
src/headless/converse-core.js

@@ -120,17 +120,15 @@ _converse.Collection = Backbone.Collection.extend({
     async clearSession (options={}) {
         await Promise.all(Array.from(this.models).map(m => {
             return new Promise(
-                success => m.destroy(
-                    Object.assign(options, {
-                        success,
-                        'error': (m, e) => {
-                            log.error(e);
-                            success()
-                        }
-                    })
-                )
+                resolve => {
+                    m.destroy(Object.assign(options, {
+                        'success': resolve,
+                        'error': (m, e) => { log.error(e); resolve() }
+                    }));
+                }
             );
         }));
+        await this.browserStorage.clear();
         this.reset();
     }
 });

+ 1 - 1
src/headless/package.json

@@ -23,7 +23,7 @@
   "gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2",
   "devDependencies": {
     "backbone": "1.4",
-    "backbone.browserStorage": "conversejs/backbone.browserStorage#2d0ceaa2f38eedc60122bb0aa23c826dc37a9194",
+    "backbone.browserStorage": "conversejs/backbone.browserStorage#674ba3aa0e4d0f0b0dcac48fcc7dea531012828f",
     "filesize": "^4.1.2",
     "jed": "1.1.1",
     "localforage": "^1.7.3",