Merge pull request #1 from aui/master

cloudhi · cloudhi · commit 66ca7c07a337 · 2014-12-17T13:43:56.000+08:00
fix bug #170
diff --git a/dist/dialog-min.js b/dist/dialog-min.js
diff --git a/dist/dialog-plus-min.js b/dist/dialog-plus-min.js
diff --git a/dist/dialog-plus.js b/dist/dialog-plus.js
@@ -1,4 +1,4 @@
-/*! artDialog v6.0.4 | https://github.com/aui/artDialog */
+/*! artDialog v6.0.5 | https://github.com/aui/artDialog */
 !(function () {
 
 var __modules__ = {};
@@ -1105,7 +1105,7 @@ $.extend(prototype, {
         if (typeof html === 'object') {
             html = $(html);
             $content.empty('').append(html.show());
-            this.addEventListener('remove', function () {
+            this.addEventListener('beforeremove', function () {
                 $('body').append(html.hide());
             });
         // String
diff --git a/dist/dialog.js b/dist/dialog.js
@@ -1,4 +1,4 @@
-/*! artDialog v6.0.4 | https://github.com/aui/artDialog */
+/*! artDialog v6.0.5 | https://github.com/aui/artDialog */
 !(function () {
 
 var __modules__ = {};
@@ -1105,7 +1105,7 @@ $.extend(prototype, {
         if (typeof html === 'object') {
             html = $(html);
             $content.empty('').append(html.show());
-            this.addEventListener('remove', function () {
+            this.addEventListener('beforeremove', function () {
                 $('body').append(html.hide());
             });
         // String
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "artDialog",
-    "version": "6.0.4",
+    "version": "6.0.5",
     "readmeFilename": "README.md",
     "description": "经典的网页对话框组件，内外皆用心雕琢",
     "homepage": "https://github.com/aui/artDialog",
diff --git a/src/dialog.js b/src/dialog.js
@@ -339,7 +339,7 @@ $.extend(prototype, {
         if (typeof html === 'object') {
             html = $(html);
             $content.empty('').append(html.show());
-            this.addEventListener('remove', function () {
+            this.addEventListener('beforeremove', function () {
                 $('body').append(html.hide());
             });
         // String
diff --git a/test/content-element.html b/test/content-element.html
@@ -18,7 +18,7 @@
 
 <script>
 seajs.use(['jquery', '../src/dialog'], function ($, dialog) {
-
+	window.dialog = dialog;
 	$('#test').on('click', function () {
 		alert('click')
 	});

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "artDialog",`
`3`		`- "version": "6.0.4",`
	`3`	`+ "version": "6.0.5",`
`4`	`4`	`"readmeFilename": "README.md",`
`5`	`5`	`"description": "经典的网页对话框组件，内外皆用心雕琢",`
`6`	`6`	`"homepage": "https://github.com/aui/artDialog",`