popup.html UI changes

popup.js improvement in Google drive search
NITDgpOS · Jan 31, 2017 · 535cd19 · 535cd19
1 parent 1ac8545
commit 535cd19
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/popup.html b/popup.html
@@ -40,23 +40,6 @@ <h1><span style="color:#4285f4">F</span><span style="color:#ea4335">e</span><spa
                     </td>
                 </tr>
                 <tr>
-                    <td colspan="2">
-                        <div>Also Show Results from : 
-                        <input type="checkbox" name="GDrive" value="GDrive" id="GDrive">
-                        <label for="GDrive">GDrive</label>
-
-                    </td>
-
-                </tr>
-                <tr>
-                    <td>
-                        <div id="searchenginewarning" style="display: none;">
-                            &#9762 Please select any one of two to search in.
-                        </div>
-                    </div>
-                    </td>
-                </tr>
-                <tr><div id="checkboxx">
                     <td colspan="2">
                         <input type="checkbox" name="music" value="music" id="music">
                         <label for="music" title="Ctrl+Alt+m">Music</label>
@@ -65,7 +48,15 @@ <h1><span style="color:#4285f4">F</span><span style="color:#ea4335">e</span><spa
                         <input type="checkbox" name="books" value="books" id="books">
                         <label for="books" title="Ctrl+Alt+b">Books</label>
                     </td>
-                </div>
+                </tr>
+                 <tr>
+                    <td colspan="2">
+
+                        <input type="checkbox" name="GDrive" value="GDrive" id="GDrive">
+                        <label for="GDrive">Also Show Results from Google Drive</label>
+
+                    </td>
+
                 </tr>
                 <tr>
                     <td>

diff --git a/popup.js b/popup.js
@@ -100,9 +100,15 @@ function register(event) {
         }
         /* eslint-disable */
         window.open("http://www.google.com/search?q="+query+" -"+uuid+" -inurl:(htm|html|php|pls|txt) intitle:index.of \"last modified\" ("+formats+")");
+
         if(document.getElementById("GDrive").checked === true)
         {
-        window.open("https://www.google.co.in/#q="+query+" site:drive.google.com")
+            if((document.getElementById("video").checked === true)||(document.getElementById("music").checked === true)){
+            window.open("https://www.google.co.in/#q="+query+" site:drive.google.com ");
+            }
+            else{
+            window.open("https://www.google.co.in/#q="+query+" site:docs.google.com ");
+            }
         }
         /* eslint-enable */
     } else {