[github-111][fix]: (close #111)

esrlabs · Feb 16, 2018 · e1fef30 · e1fef30
1 parent a679c40
commit e1fef30
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/app/client/src/app/views/search.results/search.request/component.ts b/app/client/src/app/views/search.results/search.request/component.ts
@@ -74,6 +74,8 @@ export class TopBarSearchRequest implements AfterContentInit{
             this.delayTimer = setTimeout(this.trigger_SEARCH_REQUEST_CHANGED.bind(this, event), SETTINGS.TYPING_DELAY);
         } else if (event.keyCode === 13) {
             this.trigger_SEARCH_REQUEST_CHANGED(event);
+        } else {
+            this.lastRequest = null;
         }
     }
 

diff --git a/app/client/src/app/views/search.results/tab.results/component.ts b/app/client/src/app/views/search.results/tab.results/component.ts
@@ -253,6 +253,7 @@ export class TabControllerSearchResults extends TabController implements ViewInt
             request['onChange']         = this.onRequestChange.bind(this, request.GUID);
             return request;
         });
+        this.checkOnOffMode();
         this.forceUpdate();
     }
 
@@ -273,6 +274,7 @@ export class TabControllerSearchResults extends TabController implements ViewInt
     onChangeState(GUID: string, active: boolean){
         Events.trigger(Configuration.sets.SYSTEM_EVENTS.REQUESTS_HISTORY_UPDATED_OUTSIDE, this._requests.map((request)=>{
             GUID === request.GUID && (request.active = active);
+            this.checkOnOffMode();
             return this.clearHandles(
                 Object.assign({}, request)
             );
@@ -345,8 +347,17 @@ export class TabControllerSearchResults extends TabController implements ViewInt
         }));
     }
 
-    onOffOn(){
-        this.onOffLabel = this.onOffLabel === ON_OFF.ON ? ON_OFF.OFF : ON_OFF.ON;
+    checkOnOffMode(){
+        if (this.requests.length === 0) {
+            this.onOffLabel = ON_OFF.ON;
+        } else {
+            this.onOffLabel = ON_OFF.OFF;
+        }
+        //this.onOffOn(null, true);
+    }
+
+    onOffOn(event: MouseEvent, noChange: boolean = false){
+        !noChange && (this.onOffLabel = this.onOffLabel === ON_OFF.ON ? ON_OFF.OFF : ON_OFF.ON);
         switch (this.onOffLabel){
             case ON_OFF.OFF:
                 Events.trigger(Configuration.sets.SYSTEM_EVENTS.REQUESTS_HISTORY_UPDATED_OUTSIDE, this._requests.map((request)=>{
@@ -730,10 +741,6 @@ export class TabControllerSearchResults extends TabController implements ViewInt
         this.updateRows();
     }
 
-    serializeHTML(html: string){
-        return html.replace(/</gi, '&lt').replace(/>/gi, '&gt');
-    }
-
     synchCounting(){
         this.requests.forEach((request: Request) => {
             this._requests.forEach((_request: Request) => {