Merge pull request #8 from Wavum/version_2.2

Version 2.2
roman-16 · Mar 14, 2017 · 2a2e74e · 2a2e74e
2 parents 6d7e299 + 9857a10
commit 2a2e74e
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 15 deletions.
diff --git a/js/index.js b/js/index.js
diff --git a/js/index.js.map b/js/index.js.map
diff --git a/ts/Config/ConfigValue/ConfigValue.ts b/ts/Config/ConfigValue/ConfigValue.ts
@@ -40,6 +40,9 @@
 
     public isSavedValue(): boolean
     {
+        if (!navigator.cookieEnabled)
+            return false;
+
         return localStorage.getItem(this.name) !== null;
     }
 

diff --git a/ts/Data/GoogleData.ts b/ts/Data/GoogleData.ts
@@ -20,9 +20,7 @@
 
         let s: HTMLScriptElement = document.createElement("script");
 
-        s.src = "https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20json%20where%20url%3D%22http%3A%2F%2Fsuggestqueries.google.com%2Fcomplete%2Fsearch%3Fclient%3Dfirefox%26q%3D" +
-                encodeURIComponent(encodeURIComponent(value)) +
-                "%22%20&format=json&callback=GoogleData.getSearchSuggestions." + id;
+        s.src = "http://suggestqueries.google.com/complete/search?client=chrome&q=" + encodeURIComponent(value) + "&callback=GoogleData.getSearchSuggestions." + id;
         s.id = "searchSuggestionsQuery" + id;
 
         document.getElementsByTagName("*")[1].appendChild(s);

diff --git a/ts/Menubar/Menubar.ts b/ts/Menubar/Menubar.ts
@@ -99,6 +99,13 @@
 
     private saveClicked(target: Object): void
     {
+        if (!navigator.cookieEnabled)
+        {
+            InformationBox.showText("You need to enable cookies!", 2000);
+
+            return;
+        }
+
         let inputChildren: Array<IInputForm> = this.sidebar.InputChildren;
 
         for (let i: number = 0; i < inputChildren.length; i++)
@@ -132,6 +139,13 @@
 
     private resetClicked(target: Object): void
     {
+        if (!navigator.cookieEnabled)
+        {
+            InformationBox.showText("You need to enable cookies!", 2000);
+
+            return;
+        }
+
         Config.reset();
 
         InformationBox.showText("Reseted!", 1000);

diff --git a/ts/Search/SearchSuggestions.ts b/ts/Search/SearchSuggestions.ts
@@ -46,7 +46,7 @@
                 {
                     this.currentSearchSuggestionsData = data;
 
-                    this.createSearchSuggestions(data.query.results.json.json[1]);
+                    this.createSearchSuggestions(data[1]);
                 }
             }.bind(this));
         }
@@ -230,12 +230,12 @@
         }
     }
 
-    private createSearchSuggestions(json: any): void
+    private createSearchSuggestions(data: any): void
     {
         //Check for no result
-        if (json !== null)
+        if (data !== null)
         {
-            let results: any = json.json;
+            let results: any = data;
             let maxResults: number = Config.NumberOfSearchSuggestions.Value;
 
             this.searchSuggestionsDiv.innerHTML = "";