Bind checkbox

shanalikhan · Jul 18, 2019 · 7e37e49 · 7e37e49
1 parent 60663e6
commit 7e37e49
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/src/service/github.oauth.service.ts b/src/service/github.oauth.service.ts
@@ -60,7 +60,7 @@ export class GitHubOAuthService {
 
         const gists: any[] = await this.getGists(token, user, host);
 
-        state.commons.webviewService.OpenGistSelectionpage(gists, cmd)
+        state.commons.webviewService.OpenGistSelectionpage(gists, cmd);
       } catch (err) {
         const error = new Error(err);
         Commons.LogException(error, state.commons.ERROR_MESSAGE, true);

diff --git a/src/service/webview.service.ts b/src/service/webview.service.ts
@@ -157,6 +157,10 @@ export class WebviewService {
         {
           find: "@RELEASE_NOTES",
           replace: "releaseNotes"
+        },
+        {
+          find: "@CHECKED",
+          replace: "checked"
         }
       ]
     },
@@ -310,14 +314,9 @@ export class WebviewService {
   }
 
   public IsLandingPageEnabled(): boolean {
-    const dontShowThisAgain = state.context.globalState.get<boolean>(
+    return !state.context.globalState.get<boolean>(
       "landingPage.dontShowThisAgain"
     );
-    if (dontShowThisAgain) {
-      return false;
-    } else {
-      return true;
-    }
   }
 
   public OpenLandingPage(cmd?: string) {
@@ -326,7 +325,8 @@ export class WebviewService {
     const content: string = this.GenerateContent({
       content: webview.htmlContent,
       items: webview.replaceables,
-      releaseNotes
+      releaseNotes,
+      checked: this.IsLandingPageEnabled()
     });
     if (webview.webview) {
       webview.webview.webview.html = content;
@@ -408,9 +408,10 @@ export class WebviewService {
       content: webview.htmlContent,
       items: webview.replaceables,
       gists,
-      skip: cmd !== "extension.downloadSettings"
-      ? `<a href="#" onclick="vscode.postMessage({close: true});" title="Skip (new one will be created upon first upload)" class="btn btn-primary mt-4">Skip (new one will be created upon first upload)</a>`
-      : ""
+      skip:
+        cmd !== "extension.downloadSettings"
+          ? `<a href="#" onclick="vscode.postMessage({close: true});" title="Skip (new one will be created upon first upload)" class="btn btn-primary mt-4">Skip (new one will be created upon first upload)</a>`
+          : ""
     });
     if (webview.webview) {
       webview.webview.webview.html = content;

diff --git a/ui/landing-page/landing-page.html b/ui/landing-page/landing-page.html
@@ -134,7 +134,8 @@ <h3 class="mx-auto mb-3 text-white-50a">
           >Questions & Issues</a
         >
         <br />
-        <a href="https://github.com/shanalikhan/code-settings-sync/blob/master/CONTRIBUTING.md"
+        <a
+          href="https://github.com/shanalikhan/code-settings-sync/blob/master/CONTRIBUTING.md"
           >Contribute</a
         >
         <br />
@@ -154,7 +155,6 @@ <h3 class="mb-3">Sponsors</h3>
           class="custom-control-input checkbox"
           type="checkbox"
           id="customCheck1"
-          checked="true"
           onclick="sendCommand('dontShowThisAgain', !this.checked)"
         />
         <label for="customCheck1" class="custom-control-label">
@@ -167,6 +167,7 @@ <h3 class="mb-3">Sponsors</h3>
     <font-injector></font-injector>
     <script defer>
       const releaseNotes = JSON.parse(`@RELEASE_NOTES`);
+      const checked = "@CHECKED";
     </script>
     <script defer src="@PWD/ui/landing-page/landing-page.js"></script>
   </body>

diff --git a/ui/landing-page/landing-page.js b/ui/landing-page/landing-page.js
@@ -36,3 +36,5 @@ releaseNotes.changes.forEach(change => {
 
 const currentVersionElement = document.querySelector("#current-version");
 currentVersionElement.innerHTML = releaseNotes.currentVersion;
+
+document.querySelector("#customCheck1").checked = checked === "true";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,5 @@ releaseNotes.changes.forEach(change => {

		const currentVersionElement = document.querySelector("#current-version");
		currentVersionElement.innerHTML = releaseNotes.currentVersion;

		document.querySelector("#customCheck1").checked = checked === "true";