From c0373a698df2e41e83869646b792768e3809a56b Mon Sep 17 00:00:00 2001
From: chestnut <mini.chenli@gmail.com>
Date: Tue, 23 Aug 2016 14:24:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=8Bnavigat?=
 =?UTF-8?q?or=E5=B7=A6=E5=8F=B3=E6=9E=81=E9=99=90=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ui/navigator.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ui/navigator.js b/src/ui/navigator.js
index 8ca3be3..111ec6f 100644
--- a/src/ui/navigator.js
+++ b/src/ui/navigator.js
@@ -326,13 +326,17 @@ define(function (require) {
         if (isNew) {
             // 二级导航位置的计算，二级导航的长度默认为去除最右子元素的边距后的剩余长度
             // 然后将二级导航的垂直平分线与一级导航子元素对齐
-            var navOffset = lib.getOffset(main);
             var navItemOffset = lib.getOffset(navItems[index]);
             var subNavOffset = lib.getOffset(ul);
             var middleOfNavItem = navItemOffset.left + navItemOffset.width / 2;
             var marginLeft = (middleOfNavItem - subNavOffset.width / 2);
-            if (marginLeft < -navOffset.left + 10) {
-                marginLeft = -navOffset.left + 10;
+            var bodyWidth = lib.getOffset(document.body).width;
+            // 看下是不是超出最左边和最右边
+            if (marginLeft < 0) {
+                marginLeft = 10;
+            }
+            else if (marginLeft + navItemOffset.right > bodyWidth) {
+                marginLeft = bodyWidth - subNavOffset.width - 10;
             }
             ul.style.cssText = 'margin-left: ' + marginLeft + 'px';
         }

From cd1b73a85f7624a62809054a64caeb7d16b6187e Mon Sep 17 00:00:00 2001
From: Justineo <justice360@gmail.com>
Date: Mon, 29 Aug 2016 15:46:54 +0800
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.md | 3 +++
 package.json | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 437b261..9f0f086 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* 0.2.10
+    - 修正二级导航左右边界的计算
+
 * 0.2.9
     - 升级 `rule` 模块下的 `phone`/`mobile` 规则，支持 `17` 开头的手机号
 
diff --git a/package.json b/package.json
index b877bff..294811d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bat-ria",
-    "version": "0.2.9",
+    "version": "0.2.10",
     "description": "RIA extension for Brand Ads Team",
     "main": "main.js",
     "repository": {
@@ -22,7 +22,7 @@
             "moment": "2.x",
             "etpl": ">=3.0.0",
             "urijs": ">=1.12.0",
-            "eoo": "~0.0.9",
+            "eoo": "^0.0.9",
             "mini-event": "~1.0.2"
         }
     },