From a5d92adaa7c0f20ebbdd736f0a8db2b2fd61e2d8 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Thu, 19 Jun 2014 19:44:07 +0400
Subject: [PATCH] Fixed screen width, disabled transitions

---
 app/css/app.css       | 21 +++++++++++++++------
 app/js/controllers.js |  4 +++-
 app/js/lib/config.js  |  4 ++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/css/app.css b/app/css/app.css
index addde1a6..c16e3008 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -879,13 +879,17 @@ a.tg_radio_on:hover i.icon-radio {
   background : rgba(0,0,0,0.0);
   width      : 12px;
   right: 0px;
-  -webkit-transition    : .2s;
-  -moz-transition       : .2s;
-  -o-transition         : .2s;
-  transition            : .2s;
   -moz-border-radius    : 0;
   -webkit-border-radius : 0;
   border-radius         : 0;
+  /*-webkit-transition    : .2s;
+  -moz-transition       : .2s;
+  -o-transition         : .2s;
+  transition            : .2s;*/
+  -webkit-transition    : none;
+  -moz-transition       : none;
+  -o-transition         : none;
+  transition            : none;
 }
 .im_dialogs_col .nano > .pane > .slider {
   background: #A5B1B9;
@@ -1136,13 +1140,18 @@ a.im_dialog_selected .im_dialog_date {
   width      : 9px;
   right: 0;
   top: 0;
-  -webkit-transition    : .2s;
+  /*-webkit-transition    : .2s;
   -moz-transition       : .2s;
   -o-transition         : .2s;
-  transition            : .2s;
+  transition            : .2s;*/
   -moz-border-radius    : 2px;
   -webkit-border-radius : 2px;
   border-radius         : 2px;
+
+  -webkit-transition    : none;
+  -moz-transition       : none;
+  -o-transition         : none;
+  transition            : none;
 }
 
 .contacts_modal_col .nano > .pane {
diff --git a/app/js/controllers.js b/app/js/controllers.js
index dc4ce52c..226aa0e5 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -321,7 +321,9 @@ angular.module('myApp.controllers', [])
         if ($routeParams.q !== lastSearch) {
           $scope.search.query = lastSearch = $routeParams.q;
           $scope.search.messages = true;
-          return false;
+          if ($scope.curDialog !== undefined) {
+            return false;
+          }
         }
       } else {
         lastSearch = false;
diff --git a/app/js/lib/config.js b/app/js/lib/config.js
index 89ff33f1..015acf67 100644
--- a/app/js/lib/config.js
+++ b/app/js/lib/config.js
@@ -35,8 +35,8 @@ Config.Navigator = {
   osX:  (navigator.platform || '').toLowerCase().indexOf('mac') != -1 ||
         (navigator.userAgent || '').toLowerCase().indexOf('mac') != -1,
   retina: window.devicePixelRatio > 1,
-  touch: $(window).width() <= 768,
-  mobile: $(window).width() < 480
+  touch: screen.width <= 768,
+  mobile: screen.width < 480
 };
 
 Config.Schema = Config.Schema || {};