From 17db4c8042b56cceafb7d3abc78e9440a177b1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= <yutent@doui.cc>
Date: Tue, 31 Jul 2018 01:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9F=BA=E7=A1=80=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E7=B4=A0UI=E6=A0=B7=E5=BC=8F;=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96:duplex=E6=8C=87=E4=BB=A4;=E4=BC=98=E5=8C=96marked?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/css/elem-ui.scss      |  2 +-
 src/js/anot-touch.js      | 12 ++++--------
 src/js/anot-touch.shim.js | 12 ++++--------
 src/js/anot.js            | 12 ++++--------
 src/js/anot.shim.js       | 12 ++++--------
 src/js/marked/theme.scss  |  4 ++--
 6 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/src/css/elem-ui.scss b/src/css/elem-ui.scss
index 29ca6ea..d0dabbb 100644
--- a/src/css/elem-ui.scss
+++ b/src/css/elem-ui.scss
@@ -89,7 +89,7 @@
 .do-ui-radio,
 .do-ui-checkbox {display:inline-block;position:relative;width:auto;height:auto;padding:0 5px 0 35px;line-height:35px;color:nth($cd, 1);font-size:14px;
 
-  >input {position:absolute;left:7px;top:7px;width:21px;height:21px;border-radius:50%;border:1px solid nth($cp, 3);appearance:none;
+  >input {position:absolute;left:7px;top:7px;width:21px;height:21px;border-radius:50%;border:1px solid nth($cp, 3);background:#fff;appearance:none;
 
     &:checked {box-shadow:0 0 5px nth($cb, 1);}
     &:checked::after {display:block;width:13px;height:13px;margin:3px;border-radius:50%;background:nth($cgr, 1);content:""}
diff --git a/src/js/anot-touch.js b/src/js/anot-touch.js
index d5a7464..347659c 100644
--- a/src/js/anot-touch.js
+++ b/src/js/anot-touch.js
@@ -4554,7 +4554,7 @@ const _Anot = (function() {
               ? 'checkbox'
               : elem.type === 'radio'
                 ? 'radio'
-                : /^change/.test(elem.getAttribute('data-duplex-event'))
+                : /^change/.test(elem.getAttribute('data-event'))
                   ? 'change'
                   : 'input'
       }
@@ -4570,7 +4570,7 @@ const _Anot = (function() {
         }
       })
       function callback(value) {
-        binding.changed.call(this, value, binding)
+        binding.changed.call(this, value)
       }
       var composing = false
       function compositionStart() {
@@ -4685,10 +4685,6 @@ const _Anot = (function() {
         binding = this,
         curValue
       if (!this.init) {
-        for (var i in Anot.vmodels) {
-          var v = Anot.vmodels[i]
-          v.$fire('anot-duplex-init', binding)
-        }
         var cpipe = binding.pipe || (binding.pipe = pipe)
         cpipe(null, binding, 'init')
         this.init = 1
@@ -4766,8 +4762,8 @@ const _Anot = (function() {
     },
     number: {
       get: function(val, binding) {
-        var number = val - 0
-        if (-val === -number) {
+        var number = +val
+        if (+val === number) {
           return number
         }
         return 0
diff --git a/src/js/anot-touch.shim.js b/src/js/anot-touch.shim.js
index d20cf27..daa9d88 100644
--- a/src/js/anot-touch.shim.js
+++ b/src/js/anot-touch.shim.js
@@ -4569,7 +4569,7 @@
               ? 'checkbox'
               : elem.type === 'radio'
                 ? 'radio'
-                : /^change/.test(elem.getAttribute('data-duplex-event'))
+                : /^change/.test(elem.getAttribute('data-event'))
                   ? 'change'
                   : 'input'
       }
@@ -4585,7 +4585,7 @@
         }
       })
       function callback(value) {
-        binding.changed.call(this, value, binding)
+        binding.changed.call(this, value)
       }
       var composing = false
       function compositionStart() {
@@ -4700,10 +4700,6 @@
         binding = this,
         curValue
       if (!this.init) {
-        for (var i in Anot.vmodels) {
-          var v = Anot.vmodels[i]
-          v.$fire('anot-duplex-init', binding)
-        }
         var cpipe = binding.pipe || (binding.pipe = pipe)
         cpipe(null, binding, 'init')
         this.init = 1
@@ -4781,8 +4777,8 @@
     },
     number: {
       get: function(val, binding) {
-        var number = val - 0
-        if (-val === -number) {
+        var number = +val
+        if (+val === number) {
           return number
         }
         return 0
diff --git a/src/js/anot.js b/src/js/anot.js
index 024f44e..5b6cdc1 100644
--- a/src/js/anot.js
+++ b/src/js/anot.js
@@ -4554,7 +4554,7 @@ const _Anot = (function() {
               ? 'checkbox'
               : elem.type === 'radio'
                 ? 'radio'
-                : /^change/.test(elem.getAttribute('data-duplex-event'))
+                : /^change/.test(elem.getAttribute('data-event'))
                   ? 'change'
                   : 'input'
       }
@@ -4570,7 +4570,7 @@ const _Anot = (function() {
         }
       })
       function callback(value) {
-        binding.changed.call(this, value, binding)
+        binding.changed.call(this, value)
       }
       var composing = false
       function compositionStart() {
@@ -4685,10 +4685,6 @@ const _Anot = (function() {
         binding = this,
         curValue
       if (!this.init) {
-        for (var i in Anot.vmodels) {
-          var v = Anot.vmodels[i]
-          v.$fire('anot-duplex-init', binding)
-        }
         var cpipe = binding.pipe || (binding.pipe = pipe)
         cpipe(null, binding, 'init')
         this.init = 1
@@ -4766,8 +4762,8 @@ const _Anot = (function() {
     },
     number: {
       get: function(val, binding) {
-        var number = val - 0
-        if (-val === -number) {
+        var number = +val
+        if (+val === number) {
           return number
         }
         return 0
diff --git a/src/js/anot.shim.js b/src/js/anot.shim.js
index cc4613d..ff5187a 100644
--- a/src/js/anot.shim.js
+++ b/src/js/anot.shim.js
@@ -4569,7 +4569,7 @@
               ? 'checkbox'
               : elem.type === 'radio'
                 ? 'radio'
-                : /^change/.test(elem.getAttribute('data-duplex-event'))
+                : /^change/.test(elem.getAttribute('data-event'))
                   ? 'change'
                   : 'input'
       }
@@ -4585,7 +4585,7 @@
         }
       })
       function callback(value) {
-        binding.changed.call(this, value, binding)
+        binding.changed.call(this, value)
       }
       var composing = false
       function compositionStart() {
@@ -4700,10 +4700,6 @@
         binding = this,
         curValue
       if (!this.init) {
-        for (var i in Anot.vmodels) {
-          var v = Anot.vmodels[i]
-          v.$fire('anot-duplex-init', binding)
-        }
         var cpipe = binding.pipe || (binding.pipe = pipe)
         cpipe(null, binding, 'init')
         this.init = 1
@@ -4781,8 +4777,8 @@
     },
     number: {
       get: function(val, binding) {
-        var number = val - 0
-        if (-val === -number) {
+        var number = +val
+        if (+val === number) {
           return number
         }
         return 0
diff --git a/src/js/marked/theme.scss b/src/js/marked/theme.scss
index 29bcd12..d0c4214 100644
--- a/src/js/marked/theme.scss
+++ b/src/js/marked/theme.scss
@@ -38,10 +38,10 @@
     }
   }
   /* 提醒文本 */
-  .md-warn,.md-mark {display:inline-block;position:relative;padding:3px 8px 3px 35px;border:1px solid nth($co, 2);border-radius:5px;background:#fffbed;color:nth($co, 3);word-break: break-all;
+  .md-warn,.md-mark {display:inline-block;position:relative;min-height:35px;margin:3px 0;padding:3px 8px 3px 35px;line-height:27px;border:1px solid nth($co, 2);border-radius:5px;background:#fffbed;color:nth($co, 3);word-break: break-all;
 
     p {margin:0!important;}
-    i {position:absolute;left:8px;top:7px;line-height:1;font-size:20px;color:nth($cr, 2);}
+    i {position:absolute;left:8px;top:6px;line-height:1;font-size:20px;color:nth($cr, 2);}
   }
   .md-mark {border-color:nth($ct, 1);color:nth($ct, 3);background:#edfbf8;
     i {color:nth($ct, 3);}