Merge pull request #46 from humanswitch/dev

release: 0.7.1
humanswitch · May 24, 2018 · e2e4f43 · e2e4f43
2 parents 6e895a6 + adc70bf
commit e2e4f43
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/dist/consentcookie.min.js b/dist/consentcookie.min.js
diff --git a/dist/consentcookie.min.js.gz b/dist/consentcookie.min.js.gz
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ConsentCookie",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "Apache 2.0",
   "author": "HumanSwitch",
   "description": "A Javascript application for for managing consents in your browser",

diff --git a/src/app.js b/src/app.js
@@ -134,7 +134,11 @@ function on($event, $callback) {
  */
 function get($id) {
   if (!$id) {
-    return getConsents();
+    // Backwards compatibility fix
+    return (($consents) => {
+      $consents.consents = $consents.getConsentMap();
+      return $consents;
+    })(getConsents());
   }
   return getConsent($id);
 }

diff --git a/src/components/applications/ccApplicationSummary.vue b/src/components/applications/ccApplicationSummary.vue
@@ -65,7 +65,7 @@
       },
       accepted: {
         get() {
-          return this.$services.applications.isAccepted(this.application);
+          return this.$services.applications.isEnabled(this.application);
         },
         set($newVal) {
           this.$services.applications.setAccepted(this.application, $newVal);

diff --git a/src/services/applicationsService.js b/src/services/applicationsService.js
@@ -69,6 +69,11 @@ function getActive() {
   return activeApplications;
 }
 
+function isEnabled($application){
+  return vue.$services.consent.getConsent($application.id)
+    .isEnabled();
+}
+
 function isAccepted($application) {
   return vue.$services.consent.getConsent($application.id)
     .isAccepted();
@@ -196,6 +201,7 @@ module.exports = {
   getActive,
   getApplicationProfile,
   getApplicationProfileInfo,
+  isEnabled,
   isAlwaysOn,
   isAccepted,
   setAccepted,