From a1eb1d878d7242b46023a93c26b3ba7ce811240b Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Tue, 19 Mar 2024 19:45:52 +0100 Subject: [PATCH] Revert "fix issue with isLocationTracked flag" This reverts commit 2d2813997d171423fab408140d6a3214e7a392d9. --- public/js/main.min.js | 2 +- src/js/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/main.min.js b/public/js/main.min.js index 7f42fad..f15c676 100644 --- a/public/js/main.min.js +++ b/public/js/main.min.js @@ -1 +1 @@ -var app=new Vue({el:"#app",data:{iOrWe:"[I/We]",typeOfApp:"Free",typeOfAppTxt:"[open source/free/freemium/ad-supported/commercial]",typeOfDev:"Individual",appName:"",appContact:"",devName:"",companyName:"",devOrCompanyName:"[Developer/Company name]",pidInfoIn:"",pidInfo:"[add whatever else you collect here, e.g. users name, address, location, pictures]",osType:"Android",effectiveFromDate:(new Date).toISOString().slice(0,10),requirementOfSystem:"system",thirdPartyServices:thirdPartyServicesJsonArray,showPrivacyModal:false,showGDPRPrivacyModal:false,showTermsModal:false,showDisclaimerModal:false,showNoTrackingPrivacyPolicyModal:false,hasThirdPartyServicesSelected:true,contentRenderType:1,wizardStep:1,totalWizardSteps:7,typeOfPolicy:"Simple",typeOfPolicyInt:1,isLocationTracked:1},filters:{capitalize:function(value){if(!value)return"";value=value.toString();return value.charAt(0).toUpperCase()+value.slice(1)}},methods:{showPrivacyModal:function(){this.showPrivacyModal=true},showNoTrackingPrivacyPolicyModal:function(){this.showNoTrackingPrivacyPolicyModal=true},showGDPRPrivacyModal:function(){this.showGDPRPrivacyModal=true},preview:function(id){this.contentRenderType=1},setTypeOfPolicyInt:function(){switch(this.typeOfPolicy){case"Simple":this.typeOfPolicyInt=1;break;case"No Tracking":this.typeOfPolicyInt=2;break;case"GDPR":this.typeOfPolicyInt=3;break}},nextStep:function(){this.wizardStep+=1},prevStep:function(){this.wizardStep-=1},checkForThirdPartyServicesEnabled:function(){let listOfEnabledThirdPartyServices=[];this.thirdPartyServices.forEach(item=>{if(item[item.model]==true){listOfEnabledThirdPartyServices.push(true)}});return listOfEnabledThirdPartyServices.length>0},toggleState:function(item){let state=item.model;Vue.set(thirdPartyServicesJsonArray,item.model,!item[state])},getHtml:function(id,target){let content=getContent(id);let title=getTitle(id);let rawHTML=getRawHTML(content,title);this.contentRenderType=2;loadInTextView(target,rawHTML)},getMarkdown:function(id,target){let content=getContent(id);let title=getTitle(id);let rawHTML=getRawHTML(content,title);let markdown=convertHtmlToMd(rawHTML);this.contentRenderType=2;loadInTextView(target,markdown)},generate:function(){if(this.typeOfDev==="Individual"){this.devOrCompanyName=this.devName}else if(this.typeOfDev==="Company"){this.devOrCompanyName=this.companyName}if(this.pidInfoIn===""){this.pidInfo="."}else{this.pidInfo=", including but not limited to "+this.pidInfoIn+"."}switch(this.typeOfApp){case"Free":case"Freemium":case"Commercial":this.typeOfAppTxt="a "+this.typeOfApp;break;case"Open Source":case"Ad Supported":this.typeOfAppTxt="an "+this.typeOfApp;break}switch(this.osType){case"Android":{this.osType="Android";this.requirementOfSystem="system";break}case"iOS":{this.osType="iOS";this.requirementOfSystem="system";break}case"Android & iOS":{this.osType="Android & iOS";this.requirementOfSystem="both systems";break}}},toggleNoTrackingPrivacyPolicyModalVisibility:function(){this.generate();this.contentRenderType==1;this.showNoTrackingPrivacyPolicyModal=!this.showNoTrackingPrivacyPolicyModal},togglePrivacyModalVisibility:function(){this.generate();this.hasThirdPartyServicesSelected=this.checkForThirdPartyServicesEnabled();this.contentRenderType=1;this.showPrivacyModal=!this.showPrivacyModal},toggleGDPRPrivacyModalVisibility:function(){this.generate();this.hasThirdPartyServicesSelected=this.checkForThirdPartyServicesEnabled();this.contentRenderType=1;this.showGDPRPrivacyModal=!this.showGDPRPrivacyModal},toggleTermsModalVisibility:function(){this.generate();this.hasThirdPartyServicesSelected=this.checkForThirdPartyServicesEnabled();this.contentRenderType=1;this.showTermsModal=!this.showTermsModal},toggleDisclaimerModalVisibility:function(){this.showDisclaimerModal=!this.showDisclaimerModal}}}); \ No newline at end of file +var app=new Vue({el:"#app",data:{iOrWe:"[I/We]",typeOfApp:"Free",typeOfAppTxt:"[open source/free/freemium/ad-supported/commercial]",typeOfDev:"Individual",appName:"",appContact:"",devName:"",companyName:"",devOrCompanyName:"[Developer/Company name]",pidInfoIn:"",pidInfo:"[add whatever else you collect here, e.g. users name, address, location, pictures]",osType:"Android",effectiveFromDate:(new Date).toISOString().slice(0,10),requirementOfSystem:"system",thirdPartyServices:thirdPartyServicesJsonArray,showPrivacyModal:false,showGDPRPrivacyModal:false,showTermsModal:false,showDisclaimerModal:false,showNoTrackingPrivacyPolicyModal:false,hasThirdPartyServicesSelected:true,contentRenderType:1,wizardStep:1,totalWizardSteps:7,typeOfPolicy:"Simple",typeOfPolicyInt:1,isLocationTracked:false},filters:{capitalize:function(value){if(!value)return"";value=value.toString();return value.charAt(0).toUpperCase()+value.slice(1)}},methods:{showPrivacyModal:function(){this.showPrivacyModal=true},showNoTrackingPrivacyPolicyModal:function(){this.showNoTrackingPrivacyPolicyModal=true},showGDPRPrivacyModal:function(){this.showGDPRPrivacyModal=true},preview:function(id){this.contentRenderType=1},setTypeOfPolicyInt:function(){switch(this.typeOfPolicy){case"Simple":this.typeOfPolicyInt=1;break;case"No Tracking":this.typeOfPolicyInt=2;break;case"GDPR":this.typeOfPolicyInt=3;break}},nextStep:function(){this.wizardStep+=1},prevStep:function(){this.wizardStep-=1},checkForThirdPartyServicesEnabled:function(){let listOfEnabledThirdPartyServices=[];this.thirdPartyServices.forEach(item=>{if(item[item.model]==true){listOfEnabledThirdPartyServices.push(true)}});return listOfEnabledThirdPartyServices.length>0},toggleState:function(item){let state=item.model;Vue.set(thirdPartyServicesJsonArray,item.model,!item[state])},getHtml:function(id,target){let content=getContent(id);let title=getTitle(id);let rawHTML=getRawHTML(content,title);this.contentRenderType=2;loadInTextView(target,rawHTML)},getMarkdown:function(id,target){let content=getContent(id);let title=getTitle(id);let rawHTML=getRawHTML(content,title);let markdown=convertHtmlToMd(rawHTML);this.contentRenderType=2;loadInTextView(target,markdown)},generate:function(){if(this.typeOfDev==="Individual"){this.devOrCompanyName=this.devName}else if(this.typeOfDev==="Company"){this.devOrCompanyName=this.companyName}if(this.pidInfoIn===""){this.pidInfo="."}else{this.pidInfo=", including but not limited to "+this.pidInfoIn+"."}switch(this.typeOfApp){case"Free":case"Freemium":case"Commercial":this.typeOfAppTxt="a "+this.typeOfApp;break;case"Open Source":case"Ad Supported":this.typeOfAppTxt="an "+this.typeOfApp;break}switch(this.osType){case"Android":{this.osType="Android";this.requirementOfSystem="system";break}case"iOS":{this.osType="iOS";this.requirementOfSystem="system";break}case"Android & iOS":{this.osType="Android & iOS";this.requirementOfSystem="both systems";break}}},toggleNoTrackingPrivacyPolicyModalVisibility:function(){this.generate();this.contentRenderType==1;this.showNoTrackingPrivacyPolicyModal=!this.showNoTrackingPrivacyPolicyModal},togglePrivacyModalVisibility:function(){this.generate();this.hasThirdPartyServicesSelected=this.checkForThirdPartyServicesEnabled();this.contentRenderType=1;this.showPrivacyModal=!this.showPrivacyModal},toggleGDPRPrivacyModalVisibility:function(){this.generate();this.hasThirdPartyServicesSelected=this.checkForThirdPartyServicesEnabled();this.contentRenderType=1;this.showGDPRPrivacyModal=!this.showGDPRPrivacyModal},toggleTermsModalVisibility:function(){this.generate();this.hasThirdPartyServicesSelected=this.checkForThirdPartyServicesEnabled();this.contentRenderType=1;this.showTermsModal=!this.showTermsModal},toggleDisclaimerModalVisibility:function(){this.showDisclaimerModal=!this.showDisclaimerModal}}}); \ No newline at end of file diff --git a/src/js/main.js b/src/js/main.js index 03d0b3d..ee087b6 100755 --- a/src/js/main.js +++ b/src/js/main.js @@ -48,7 +48,7 @@ var app = new Vue({ totalWizardSteps: 7, typeOfPolicy: 'Simple', typeOfPolicyInt: 1, - isLocationTracked: 1, + isLocationTracked: false, }, filters: { capitalize: function (value) {