v1.1.3

jitukeji · jitukeji · commit 1386a02ba122 · 2015-11-09T23:39:35.000+08:00
diff --git a/html/alert_frm.html b/html/alert_frm.html
@@ -23,6 +23,9 @@
         <div class="aui-btn aui-btn-block aui-btn-info" tapmode onclick="alertTxt()">简单自定义</div>
         <div class="aui-btn aui-btn-block aui-btn-info" tapmode onclick="alertCustom()">自定义消息内容样式</div>
     </div>
+    <div class="aui-content-padded">
+        <p>结果：<span id="result"></span></p>
+    </div>
 </body>
 <script type="text/javascript" src="../script/api.js" ></script>
 <script type="text/javascript" src="../script/aui-alert.js" ></script>
@@ -33,7 +36,7 @@
         },function(ret){
             //处理回调函数
             if(ret){
-               alert("你点击了第"+ret+"个按钮"); 
+               $api.text($api.byId("result"),"你点击了第"+ret+"个按钮");
             }
         })
     }
@@ -50,9 +53,9 @@
             //处理回调函数
             if(ret){
                 if(ret==0){
-                    alert("AUI没有得到你的认可我们会继续努力");
+                    $api.text($api.byId("result"),"AUI没有得到你的认可我们会继续努力");
                 }else{
-                    alert("感谢你对AUI的支持");
+                    $api.text($api.byId("result"),"感谢你对AUI的支持");
                 }
             }
         })
@@ -73,7 +76,7 @@
             //处理回调函数
             if(ret){
                if(ret==0){
-                    alert("感谢支持");
+                    $api.text($api.byId("result"),"感谢支持");
                 }
             }
         })
diff --git a/html/aui_alert_frm.html b/html/aui_alert_frm.html
@@ -7,7 +7,6 @@
     <link rel="stylesheet" type="text/css" href="../css/aui.css" />
 </head>
 <style>
-
 * {
     margin:0;
 }
@@ -19,12 +18,8 @@
 }
 body{
     background: rgba(0,0,0,0.3);
-    -webkit-animation: fadeIn .15s ease both;
     overflow: hidden;
 }
-body.fadeOut {
-    -webkit-animation: fadeOut .15s ease both;
-}
 #aui-box {
     position: absolute;
     width: 80%;
@@ -33,8 +28,7 @@
     left: 50%;
     margin-left: -40%;
     background: #ffffff;
-    opacity: 1;
-    overflow: hidden;
+    -webkit-animation: fadeIn .3s;
 }
 #aui-box-header {
     padding: 10px 15px 0 15px;
@@ -51,28 +45,16 @@
     overflow: hidden;
     font-size: 1em;
 }
-#aui-box-footer:after {
-    border-top: 1px solid #dbdbdb;
-    display: block;
-    content: '';
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    -webkit-transform-origin: 0 0;
-    -webkit-transform: scale(1);
-    pointer-events: none;
-}
-#aui-box-footer .aui-box-btn,
-#aui-box-footer .aui-box-btn {
+.aui-box-btn {
     float: left;
     text-align: center;
     position: relative;
     padding: 15px 0;
+    z-index: 999;
 }
 .aui-box-btn:after {
     border-right: 1px solid #dbdbdb;
+    border-top: 1px solid #dbdbdb;
     display: block;
     content: '';
     position: absolute;
@@ -84,7 +66,7 @@
     -webkit-transform: scale(1);
     pointer-events: none;
 }
-.aui-alert-btn:last-child:after {
+.aui-box-btn:last-child:after {
     border-right: 0;
 }
 @media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
@@ -97,21 +79,14 @@
 }
 @-webkit-keyframes fadeIn {
     from { background: rgba(0,0,0,0);opacity: 0; }
-    to { background: rgba(0,0,0,0.3);opacity: 1; }
-}
-@-webkit-keyframes fadeOut {
-    from {}
-    to {opacity: 0;background: rgba(0,0,0,0);}
+    to { opacity: 1; }
 }
 </style>
 <body>
     <div id="aui-box">
         <div id="aui-box-header"></div>
         <div id="aui-box-body"></div>
-        <div id="aui-box-footer">
-            <div class="aui-box-btn" data-index="1" data-status="1" tapmode style="width:50%">确定</div>
-            <div class="aui-box-btn" data-index="1" data-status="1" tapmode style="width:50%">确定</div>
-        </div>
+        <div id="aui-box-footer"></div>
     </div>
 </body>
 <script type="text/javascript" src="../script/api.js" ></script>
@@ -134,7 +109,6 @@
             btnHtml += '<div class="aui-box-btn" id="btn-'+i+'" data-status="1" tapmode onclick="btnClick('+i+')" style="color:'+btnColor+';width:'+btnWidth+'%">'+buttons[i]+'</div>';
         }
         $api.html($api.byId("aui-box-footer"),btnHtml);
-
         var frameHeight = api.frameHeight;
         var boxHeight = $api.offset($api.byId("aui-box")).h;
         if(frameHeight - boxHeight > 100){
@@ -147,24 +121,16 @@
             var contMaxHeight = frameHeight/3;
             var boxTop = (frameHeight-contMaxHeight)/3;
         }
-        
         $api.css($api.byId("aui-box-body"),"max-height:"+contMaxHeight+"px;color:"+contColor+"");
         $api.css($api.byId("aui-box"),"top:"+boxTop+"px;opacity:1;border-radius:"+radius+"px");
         api.parseTapmode();
     }
     function btnClick(index){
-        var btnDom = $api.byId("btn-"+index);
-        if($api.attr(btnDom,'data-status')=='1'){
-            api.sendEvent({
-                name: 'auiAlertEvent',
-                extra: {buttonIndex:index}
-            });
-            $api.addCls($api.dom("body"),"fadeOut");
-            $api.attr(btnDom,'data-status',0)
-            setTimeout(function(){
-                api.closeFrame();
-            },150)
-        }
+        api.sendEvent({
+            name: 'auiAlertEvent',
+            extra: {buttonIndex:index}
+        });
+        api.closeFrame();
     }
 </script>
 </html>
diff --git a/html/demo_form_frm.html b/html/demo_form_frm.html
@@ -37,7 +37,7 @@
             <div class="aui-input-row">
                 <input type="number" class="aui-input" id="code" placeholder="请输入收到的验证码"/>
                 <span class="aui-input-addon">
-                    <div class="aui-btn" id="sendVerify" tapmode onclick="getVerify()">获取验证码</div>
+                    <div class="aui-btn" id="sendVerify" status="1" tapmode onclick="getVerify()">获取验证码</div>
                 </span>
             </div>
             
@@ -69,7 +69,12 @@
     }
     function getVerify() {
         var sendVerify = $api.byId('sendVerify');
+        var status = $api.attr(sendVerify,'status');
+        if(status!=1){
+            return;
+        }
         $api.removeAttr(sendVerify,'onclick');
+        api.parseTapmode();
         $api.html(sendVerify,'<span id="GetVerify">120</span>S');
         times = 119;
         isinerval = setInterval("CountDown()", 1000);
@@ -82,6 +87,8 @@
         if (times < 1) {
             var sendVerify = $api.byId('sendVerify');
             $api.attr(sendVerify,'onclick','get_verify()');
+            $api.attr(sendVerify,'status','1');
+            api.parseTapmode();
             $api.html(sendVerify,'重新获取');
             clearInterval(isinerval);
             return;
