Merge pull request OpenNHP#51 from allmobilize/codename-h

weekly update - 2014.09 W1
creturn · Sep 5, 2014 · f005b11 · f005b11
2 parents 55e5c11 + dfa2f95
commit f005b11
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Amaze UI Change Log
 ---
 
+## 2014.09 W1
+
+__JS 插件__：
+
+- `NEW` 新增移动端图片浏览插件（还在优化完善）。
+
+__Navbar 组件__：
+
+- `IMPROVED` 使用 Flexbox 实现工具栏平均分布；
+- `FIXED` 修复二维码 URL。
+
+
 ## 2014.08 W4
 
 __Navbar 组件__：

diff --git a/dist/AmazeUI-1.0.0-beta1-20140901.zip b/dist/AmazeUI-1.0.0-beta1-20140901.zip
diff --git a/dist/AmazeUI-1.0.0-beta1-20140905.zip b/dist/AmazeUI-1.0.0-beta1-20140905.zip
diff --git a/js/ui.share.js b/js/ui.share.js
@@ -335,7 +335,7 @@ define(function(require, exports, module) {
             var qrNode = new QRCode({
                 render: 'canvas',
                 correctLevel: 0,
-                text: doc.location,
+                text: doc.location.href,
                 width: 180,
                 height: 180,
                 background: '#fff',

diff --git a/widget/navbar/src/navbar.js b/widget/navbar/src/navbar.js
@@ -53,7 +53,7 @@ define(function(require, exports, module) {
                     var qrnode = new QRCode({
                         render: 'canvas',
                         correctLevel: 0,
-                        text: window.location,
+                        text: window.location.href,
                         width: 200,
                         height: 200,
                         background: '#fff',

diff --git a/widget/navbar/src/navbar.less b/widget/navbar/src/navbar.less
@@ -149,7 +149,7 @@
   }
 
   canvas {
-    display: inline-block;
+    display: block;
     width: 200px;
     height: 200px;
   }