Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -10,24 +10,12 @@ var $searchBox = $('.search-box'),
     $box = $('.box'),
     $box = $('.box'),
     $indexSearch = $('.index-search'),
     $indexSearch = $('.index-search'),
     $indexLogo = $('.index-logo'),
     $indexLogo = $('.index-logo'),
-    $channelLink = $('.index-channel a'),
-    $win = $(window),
-    $doc = $(document),
-    $appFloatLayer = $('#float-layer-app');
+    $channelLink = $('.index-channel a');
 
 
 var $search = $searchBox.children('input[type="text"]'),
 var $search = $searchBox.children('input[type="text"]'),
     $cancelSearch = $box.children('.no-search'),
     $cancelSearch = $box.children('.no-search'),
     $searchIcon = $searchBox.children('.search-icon');
     $searchIcon = $searchBox.children('.search-icon');
 
 
-// variables for calculate the app download layer position
-var layerInit = false,
-    windowViewHeight = 0,
-    layerContentHeight = $appFloatLayer.height(),
-    layerPaddingTop = parseInt($appFloatLayer.css('padding-top')),
-    layerPaddingBottom = parseInt($appFloatLayer.css('padding-bottom')),
-    layerHeight = layerContentHeight + layerPaddingTop + layerPaddingBottom,
-    layerNewPos;
-
 require('../common');
 require('../common');
 
 
 $search.on('focus', function() {
 $search.on('focus', function() {
@@ -59,6 +47,15 @@ $searchBox.children('.search-icon').on('touchstart', function() {
     $indexSearch.submit();
     $indexSearch.submit();
 });
 });
 
 
+$searchBox.keyup(function(e) {
+    if (e.keyCode === 13) {
+        if (security.hasDangerInput()) {
+            return false;
+        }
+        $indexSearch.submit();
+    }
+});
+
 $('.index-channel img').on('load error', function() {
 $('.index-channel img').on('load error', function() {
     window.rePosFooter && window.rePosFooter();
     window.rePosFooter && window.rePosFooter();
 });
 });
@@ -81,40 +78,3 @@ $channelLink.on('touchstart', function() {
         borderColor: '#fff'
         borderColor: '#fff'
     });
     });
 });
 });
-
-
-function updateLayerPosition() {
-    var winHeight = window.innerHeight,
-        bodyHeight = $doc.height(),
-        scrollTopPosition = $win.scrollTop();
-
-    if (layerInit) {
-
-        //keyboard is shown
-        if (windowViewHeight - winHeight > 200) {
-            if (scrollTopPosition + windowViewHeight + layerHeight >= bodyHeight) {
-                layerNewPos = 0;
-            } else {
-                layerNewPos = bodyHeight - windowViewHeight - scrollTopPosition - layerHeight;
-            }
-        } else {
-            layerNewPos = bodyHeight - winHeight - scrollTopPosition;
-        }
-
-    } else {
-        windowViewHeight = winHeight;
-        layerNewPos = bodyHeight - winHeight - scrollTopPosition + layerHeight;
-        layerInit = true;
-    }
-
-    $appFloatLayer.css({
-        position: 'relative',
-        bottom: layerNewPos + 'px'
-    });
-}
-
-$(window).scroll(function() {
-    window.requestAnimationFrame(updateLayerPosition);
-});
-
-$doc.on('ready', updateLayerPosition);