From e85868a9bfb5666e77b988af43a6cea91f8c1680 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Mon, 10 Feb 2014 21:30:59 +0400
Subject: [PATCH] merged with master

---
 index.html       | 2 +-
 js/directives.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index fbeb4906..0e77c272 100644
--- a/index.html
+++ b/index.html
@@ -55,7 +55,7 @@
   <script type="text/javascript" src="js/services.js?21"></script>
   <script type="text/javascript" src="js/controllers.js?29"></script>
   <script type="text/javascript" src="js/filters.js?4"></script>
-  <script type="text/javascript" src="js/directives.js?19"></script>
+  <script type="text/javascript" src="js/directives.js?20"></script>
 
 </body>
 </html>
diff --git a/js/directives.js b/js/directives.js
index 6b9c2e7c..b0b46c6b 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -46,7 +46,7 @@ angular.module('myApp.directives', ['myApp.filters'])
           moreNotified = false;
 
       onContentLoaded(function () {
-        $(dialogsWrap).nanoScroller({preventPageScrolling: true, tabIndex: -1});
+        $(dialogsWrap).nanoScroller({preventPageScrolling: true, tabIndex: -1, iOSNativeScrolling: true});
       });
 
       var updateScroller = function () {
@@ -116,7 +116,7 @@ angular.module('myApp.directives', ['myApp.filters'])
 
       onContentLoaded(function () {
         scrollableWrap.scrollTop = scrollableWrap.scrollHeight;
-        $(historyWrap).nanoScroller({preventPageScrolling: true, tabIndex: -1});
+        $(historyWrap).nanoScroller({preventPageScrolling: true, tabIndex: -1, iOSNativeScrolling: true});
       });
 
       var updateScroller = function (delay) {