Merge pull request #173 from ajayyy/experimental-ajay

Made the popup work on non YouTube tabs

_locales/en/messages.json

@@ -100,7 +100,7 @@
         "message": "Sponsorship Ends Now"
     },
     "noVideoID": {
-        "message": "This probably isn't a YouTube tab, or you clicked too early. \n If you know this is a YouTube tab,\n close this popup and open it again.\n\nYou must refresh your YouTube tab after installing or updating (even auto-update) the extension."
+        "message": "No YouTube video found at this tab. If you know this is a YouTube tab, close this popup and open it again. If that does not work, try reloading the tab."
     },
     "success": {
         "message": "Success!"

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_fullName__",
   "short_name": "__MSG_Name__",
-  "version": "1.1.9.5",
+  "version": "1.1.9.6",
   "default_locale": "en",
   "description": "__MSG_Description__",
   "content_scripts": [

popup.html

@@ -14,7 +14,7 @@
           </h1>
 
           <!-- Loading text -->
-          <p id="loadingIndicator" class="popupElement">__MSG_Loading__</p>
+          <p id="loadingIndicator" class="popupElement">__MSG_noVideoID__</p>
           
           <!-- Hidden until loading complete -->
           <div id="mainControls" class="main popupElement" style="display: none">
@@ -89,13 +89,6 @@
 
             <br/>
 
-            <div>
-              <button id="disableSkipping" class="greenButton popupElement">__MSG_disableSkipping__</button>
-              <button id="enableSkipping" class="whitelistButton popupElement" style="display: none">__MSG_enableSkipping__</button>
-            </div>
-
-            <br/>
-
             <button id="reportAnIssue" class="dangerButton popupElement">__MSG_voteOnTime__</button>
 
             <div id="issueReporterContainer"  class="popupElement" style="display: none">
@@ -108,6 +101,16 @@
 
             </div>
 
+            <br/>
+            <br/>
+
+          </div>
+
+          <div>
+            <button id="disableSkipping" class="greenButton popupElement">__MSG_disableSkipping__</button>
+            <button id="enableSkipping" class="whitelistButton popupElement" style="display: none">__MSG_enableSkipping__</button>
+          </div>
+
           <h2 class="recordingSubtitle popupElement">__MSG_yourWork__</h2>
 
           <p class="popupElement">
@@ -229,7 +232,6 @@
               <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">__MSG_showNotice__</button>
           </div>
         </div>
-        </div>
     </center>
   </body>