remove showvideo, gather code into SignItCoreContent.js

lingua-libre · Dec 14, 2023 · 4754542 · 4754542
1 parent 0fd25bc
commit 4754542
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/SignItCoreContent.js b/SignItCoreContent.js
@@ -71,8 +71,10 @@ var SignItCoreContent = function (banana) {
     //	// TODO: Do something
     // }.bind( this ) );
 
-  // @saltykheera's toggle video solution :
+
   /* 
+  // @saltykheera's toggle video solution :
+
   document.addEventListener("DOMContentLoaded", function(){
      // Initializing the visibility state
      let video_pop = false;
@@ -82,12 +84,30 @@ var SignItCoreContent = function (banana) {
        video_pop = !video_pop;
        $(".signit-panel-videos").toggle(video_pop);
        $(".signit-panel-separator").toggle(video_pop);
-     }    
+     }
      // Button toggle video
      $("#video_toggle").on("click", function () {
        toggleVideoPop();
      });
-  }); */
+  }); 
+
+   // @hugolpz toggle video solution :
+  	// Create toggle button to add to definition panel:
+		showvideoWidget = new OO.ui.ToggleSwitchWidget( { value: true } ); // if choosepanels == both
+		showvideoWidget.setValue( _backgroundPage.params.choosepanels == 'both'? true:false; );
+    // Create legend:
+		showvideoLayout = new OO.ui.FieldLayout( showvideoWidget, {
+			label: banana.i18n("si-popup-settings-showvideo"),
+			align: 'top',
+		});
+    // Append in right place :
+    this.$definitionPanelContent.append( showvideoLayout.$element )
+
+		// On change : 1) change choosepanels value in local storage ; 2) refresh modal if possible or just directly toglle.
+		// showvideoWidget.on( 'change', _backgroundPage.storeParam.bind( _backgroundPage, 'choosepanels' ) );
+		// choosepanels= value==true?'both':'definition';
+  
+  */
 
   SignItCoreContent.prototype.refresh = function (title, files) {
     files = files || [];

diff --git a/background-script.js b/background-script.js
@@ -68,10 +68,7 @@ var state = 'up', // up, loading, ready, error
 		twospeed: true,
 		hinticon: true,
 		coloredwords: true,
-		// Preparation for issues/36
-		showvideo: true,
-		showdefinition: true,
-		choosepanels: 'both',
+		choosepanels: 'both', // issues/36
 	};
 
 /* *************************************************************** */
@@ -410,7 +407,6 @@ async function main() {
     // storeParam( 'twospeed', params.twospeed ); //
 	await getStoredParam( 'hinticon' );
 	await getStoredParam( 'coloredwords' );
-	await getStoredParam( 'showvideo' );
 	await getStoredParam( 'choosepanels' );
 
 	signLanguage = await getStoredParam( 'signLanguage' );

diff --git a/content_scripts/signit.js b/content_scripts/signit.js
@@ -193,8 +193,6 @@
 	}
 	// SignIt modal width depends on number of active panels
 	var signItModalWidth  = async function(){
-		// var showvideo = Object.values( await browser.storage.local.get( 'showvideo' ) )[0];
-		// numberOfPanels = (showvideo?1:0)+1;
 		var activepanels = Object.values( await browser.storage.local.get( 'choosepanels' ) )[0];
 		var numberOfPanels = activepanels == 'both' ? 2:1;
 		return numberOfPanels==2? 850:450;

diff --git a/popup/popup.js b/popup/popup.js
@@ -241,14 +241,6 @@ var browser = browser || chrome;
 			label: banana.i18n("si-popup-settings-enlighten"),
 			align: 'top',
 		} );
-		// Show video panel
-		showvideoWidget = new OO.ui.ToggleSwitchWidget( {
-			value: true
-		} );
-		showvideoLayout = new OO.ui.FieldLayout( showvideoWidget, {
-			label: banana.i18n("si-popup-settings-showvideo"),
-			align: 'top',
-		} );
 
 		// Choose panels : both, definition, video
 		var panelsOption0 = new OO.ui.ButtonOptionWidget( {
@@ -282,8 +274,8 @@ var browser = browser || chrome;
 		twospeedWidget.setValue( _backgroundPage.params.twospeed );
 		hinticonWidget.setValue( _backgroundPage.params.hinticon );
 		coloredwordsWidget.setValue( _backgroundPage.params.coloredwords );
-		showvideoWidget.setValue( _backgroundPage.params.showvideo );
-		// TEST Tri-buttons : selectItemByData or setData
+
+		// Tri-buttons : selectItemByData or setData
 		choosepanelsWidget.setData( _backgroundPage.params.choosepanels );
 		choosepanelsWidget.selectItemByData( _backgroundPage.params.choosepanels );
 
@@ -301,8 +293,6 @@ var browser = browser || chrome;
 		// _backgroundPage.storeParam( 'twospeed', _backgroundPage.params.twospeed ); // twospeed in localStorage before first usage-change
 		hinticonWidget.on( 'change', _backgroundPage.storeParam.bind( _backgroundPage, 'hinticon' ) );
 		coloredwordsWidget.on( 'change', _backgroundPage.storeParam.bind( _backgroundPage, 'coloredwords' ) );
-		// TEST: Choose panels to display 
-		showvideoWidget.on( 'change', _backgroundPage.storeParam.bind( _backgroundPage, 'showvideo' ) );
 		// Listen for item selection events
 		choosepanelsWidget.on('choose', (d)=>{ 
 			_backgroundPage.storeParam('choosepanels', d.getData()); 
@@ -317,7 +307,6 @@ var browser = browser || chrome;
 			.append( twospeedLayout.$element )
 			.append( hinticonLayout.$element )
 			.append( coloredwordsLayout.$element )
-			.append( showvideoLayout.$element )
 			.append( choosepanelsLayout.$element );
 	};