Merge pull request #7 from hadrrb/save-lang-height

hadrrb · web-flow · commit 38b869242a86 · 2022-02-23T22:04:18.000+01:00
Save last lang and height
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to the "wordle" extension will be documented in this file.
 
+## 1.0.3
+
+- Ability to change height in settings as well
+- The last chosen language and height will be saved from now on
+
 ## 1.0.2
 
 - Changed English Wordle to <a href="https://mikhad.github.io/wordle/#daily">Wordle+</a> because the original cannot be loaded as an iframe because of X-Frame-Options policy.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-wordle",
   "displayName": "Wordle for VSCode",
   "description": "Play Wordle in your VSCode",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "keywords": ["wordle", "word game", "game"],
   "publisher": "RamziHadrich",
   "author": {
@@ -54,6 +54,11 @@
             "type": "string",
             "description": "Wordle width (in px or in %)",
             "default": "100%"
+          },
+          "wordle.height": {
+            "type": "number",
+            "description": "Wordle height (in px)",
+            "default": 600
           }
         }
       }
diff --git a/src/extension.ts b/src/extension.ts
@@ -25,8 +25,7 @@ export function activate(context: vscode.ExtensionContext) {
 
   vscode.workspace.onDidChangeConfiguration((e) => {
     if(e.affectsConfiguration("wordle")){
-        let lang = vscode.workspace.getConfiguration("wordle").get<string>("defaultLang");
-        wordleProvider.setLang(lang);
+        wordleProvider.reload();
     }});
 
   context.subscriptions.push(wordle);
diff --git a/src/pick_language.ts b/src/pick_language.ts
@@ -29,11 +29,8 @@ export async function pick_language(wordleProvider: WordleProvider) {
         title: "Wordle Language"
     });
     if(lang){
-        let link = wordles[lang];
-        if (link){
-            wordleProvider.changeLanguage(link);
-        }
-        
+        vscode.workspace.getConfiguration("wordle").update("defaultLang", lang, true);
+        wordleProvider.reload();
     }
     
 }
diff --git a/src/wordle.ts b/src/wordle.ts
@@ -4,8 +4,6 @@ import { pick_language, wordles } from './pick_language';
 export class WordleProvider implements vscode.WebviewViewProvider {
 
     private _view?: vscode.WebviewView;
-    private height: number = 600;
-    private wordleLink!: string;
 
     constructor(){
         let lang = vscode.workspace.getConfiguration("wordle").get<string>("defaultLang");
@@ -14,12 +12,9 @@ export class WordleProvider implements vscode.WebviewViewProvider {
 
     public setLang(lang: string | undefined){
         if(lang){
-            this.wordleLink = wordles[lang];
+            return wordles[lang];
         } else {
-            this.wordleLink = wordles["English"];
-        }
-        if (this._view) {
-            this._view.webview.html = this._getHtmlForWebview();
+            return wordles["English"];
         }
     }
 
@@ -37,6 +32,8 @@ export class WordleProvider implements vscode.WebviewViewProvider {
 	}
 
     private _getHtmlForWebview() {
+        let link = this.setLang(vscode.workspace.getConfiguration("wordle").get<string>("defaultLang"));
+        let height = vscode.workspace.getConfiguration("wordle").get<string>("height");
         let width = vscode.workspace.getConfiguration("wordle").get<string>("width");
         return `<!DOCTYPE html>
         <html>
@@ -47,22 +44,23 @@ export class WordleProvider implements vscode.WebviewViewProvider {
         
         </head>
         <body>
-            <iframe src="${this.wordleLink}" height="${this.height}" width="${width}" scrolling="no" frameborder="0" wmode="transparent"></iframe> 
+            <iframe src="${link}" height="${height}" width="${width}" scrolling="no" frameborder="0" wmode="transparent"></iframe> 
         </body>
         </html>`;
     }
 
-    public changeLanguage(link: string){
-        this.wordleLink = link;
+    public reload(){
         if (this._view) {
             this._view.webview.html = this._getHtmlForWebview();
         }
     }
 
-    public changeHeight(value: number){
-        this.height = this.height + value;
-        if (this._view) {
-            this._view.webview.html = this._getHtmlForWebview();
+    public changeHeight(change: number){
+        let height = vscode.workspace.getConfiguration("wordle").get<number>("height");
+        if(height){
+            height = height + change;
+            vscode.workspace.getConfiguration("wordle").update("height", height, true);
+            this.reload();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,8 @@ export async function pick_language(wordleProvider: WordleProvider) {`
`29`	`29`	`title: "Wordle Language"`
`30`	`30`	`});`
`31`	`31`	`if(lang){`
`32`		`- let link = wordles[lang];`
`33`		`- if (link){`
`34`		`- wordleProvider.changeLanguage(link);`
`35`		`- }`
`36`		`-`
	`32`	`+ vscode.workspace.getConfiguration("wordle").update("defaultLang", lang, true);`
	`33`	`+ wordleProvider.reload();`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`}`