Merge pull request #97 from luolonghao/master

improve [data-role=close] selector
aralejs · May 20, 2015 · e695da4 · e695da4
2 parents e700551 + 255cc82
commit e695da4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/examples/index.md b/examples/index.md
@@ -36,7 +36,7 @@ new Dialog({
 
 <button id="example2">内容传入DOM 对象</button>
 
-<div class="fn-hide"><div id="example2-dom" style="padding:50px">传入了DOM</div></div>
+<div class="fn-hide"><div id="example2-dom" style="padding:50px">传入了DOM，<button type="button" data-role="close">关闭</button></div></div>
 
 
 ````javascript

diff --git a/src/dialog.js b/src/dialog.js
@@ -106,7 +106,7 @@ var Dialog = Overlay.extend({
     // 这样写是为了回避 arale.base 的一个问题：
     // 当属性初始值为''时，不会进入 onRender 方法
     // https://github.com/aralejs/base/issues/7
-    this.$('[data-role=close]').hide();
+    this.$('>[data-role=close]').hide();
   },
 
   events: {
@@ -198,9 +198,9 @@ var Dialog = Overlay.extend({
 
   _onRenderCloseTpl: function (val) {
     if (val === '') {
-      this.$('[data-role=close]').html(val).hide();
+      this.$('>[data-role=close]').html(val).hide();
     } else {
-      this.$('[data-role=close]').html(val).show();
+      this.$('>[data-role=close]').html(val).show();
     }
   },