Merge remote-tracking branch 'origin/release-1.3.0' into release-1.3.0

index.html

@@ -27,9 +27,21 @@
                 apiKey: 'wiE55BGOG8BkGnpPs6UNtPbb'
             });
 
+            var $a = $('p.login a').hide();
+
+            function loadingAnimate(on) {
+                if (on) {
                     $('hr').addClass('loading');
+                    loadingAnimate.timer = setTimeout(function() {
+                        $('hr').addClass('animated');
+                    }, 660);
+                } else {
+                    clearTimeout(loadingAnimate.timer);
+                    $('hr').removeClass('loading animated');
+                }
+            }
 
-            var $a = $('p.login a').hide();
+            loadingAnimate(true);
 
             fio.user.check().then(function(user) {
                 if (user) {
@@ -37,7 +49,7 @@
                 }
                 else {
                     $a.fadeIn(800);
-                    $('hr').removeClass('loading');
+                    loadingAnimate(false);
                 }
             });
             
@@ -49,7 +61,20 @@
                     redirectUrl: urlparts + '/edit.html',
                     remember: 7 * 24 * 60 * 60
                 });
-                $('hr').addClass('loading');
+                loadingAnimate(true);
+            });
+
+            function preload(url) {
+                return new Promise(function(resolve, reject) {
+                    var img = new Image();
+                    img.onload = resolve;
+                    img.onerror = reject;
+                    img.src = url;
+                });
+            }
+
+            preload('ui/theme/default/images/indexbackground.jpg').then(function() {
+                $('div.background').addClass('loaded');
             });
         });
 
@@ -63,11 +88,35 @@
             margin: 0;
             padding: 0;
             overflow: hidden;
-            -webkit-user-select: none;
+            height: 100%;
+            font-size: 0;
+            line-height: 0;
+            z-index: -2;
         }
 
-        h1:before {
-            content: ' ';
+        body {
+            background: #99806B;
+        }
+
+        ::-webkit-selection {
+            background: #FFEFEF;
+            color: #4A4F5D;
+        }
+        ::-moz-selection {
+            background: #FFEFEF;
+            color: #4A4F5D;
+        }
+        ::-ms-selection {
+            background: #FFEFEF;
+            color: #4A4F5D;
+        }
+        ::selection {
+            background: #FFEFEF;
+            color: #4A4F5D;
+        }
+
+        div.background {
+            opacity: 0;
             display: block;
             background: url(ui/theme/default/images/indexbackground.jpg) no-repeat;
             background-size: cover;
@@ -83,9 +132,15 @@
             -o-filter: blur(5px);
             filter: url(ui/theme/default/images/blur.svg#blur);
             filter: blur(5px);
+            -webkit-transition: opacity 1.5s ease;
+            transition: opacity 1.5s ease;
         }
 
-        h1:after {
+        div.background.loaded {
+            opacity: 1;
+        }
+
+        h1:before {
             content: ' ';
             display: block;
             position: absolute;
@@ -93,7 +148,7 @@
             bottom: 0;
             left: 0;
             right: 0;
-            background: rgba(0, 0, 0, .75);
+            background: rgba(0, 0, 0, .5);
             z-index: -1;
         }
 
@@ -119,34 +174,40 @@
             border-bottom: 1px solid #F98183;
             width: 110px;
             margin: 40px auto;
-            transition: transform 0.5s ease;
-            -webkit-transition: -webkit-transform 0.5s ease;
+            -webkit-transition: -webkit-transform 0.66s ease;
+            transition: transform 0.66s ease;
+            -webkit-backface-visibility: hidden;
         }
 
         hr.loading {
+            -webkit-transform: translate3d(100px, 0, 0);
+            transform: translate3d(100px, 0, 0);
+        }
+
+        hr.animated {
             -webkit-animation: slide 1.33s ease-in-out infinite alternate;
             animation: slide 1.33s ease-in-out infinite alternate;
         }
 
         @-webkit-keyframes slide {
             0% { 
-                transform: translate3d(-100px, 0, 0); 
-                -webkit-transform: translate3d(-100px, 0, 0);
+                -webkit-transform: translate3d(100px, 0, 0);
+                transform: translate3d(100px, 0, 0); 
             }
             100% { 
-                transform: translate3d(100px, 0, 0); 
                 -webkit-transform: translate3d(-100px, 0, 0);
+                transform: translate3d(-100px, 0, 0); 
             }
         }
 
         @keyframes slide {
             0% { 
-                transform: translate3d(-100px, 0, 0); 
-                -webkit-transform: translate3d(-100px, 0, 0);
+                -webkit-transform: translate3d(100px, 0, 0);
+                transform: translate3d(100px, 0, 0); 
             }
             100% { 
-                transform: translate3d(100px, 0, 0); 
                 -webkit-transform: translate3d(-100px, 0, 0);
+                transform: translate3d(-100px, 0, 0); 
             }
         }
 
@@ -171,6 +232,10 @@
             position: relative;
             overflow: hidden;
             margin-top: 50px;
+            -webkit-user-select: none;
+            -moz-user-select: none;
+            -mz-user-select: none;
+            user-select: none;
         }
 
         p.login a:active {
@@ -203,6 +268,7 @@
     </style>
 </head>
 <body>
+    <div class="background"></div>
     <h1>百度脑图 <br/> 便捷的思维编辑工具</h1>
     <hr /> 
     <p class="description">

ui/menu/help/help.js

@@ -44,16 +44,32 @@ KityMinder.registerUI('menu/help/help', function (minder) {
         $help.find('.km-version').text(KityMinder.version);
 
         // 彩蛋：点很多次按钮的蛋疼
+        /*9szjzrzdznztz6z1z28z1wzhzbz9z4z2mz23z27zcz1xz27z9z2lz38z17z0z0z0z0z0z0z0z0z0z0z0z23zfz20z8z26z27z9z2lz38z17z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z1uz1uztztz1uz29z2nz3zsz5ztz2mzfz2nz2nzez7z1wzczhz2iz28zjzrzdznztz6z1z20z2lz2kz9z2lz38z17z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z2cznzhz1z7zsz28z2azhzjz1zmz19z14zqz2mz2lz2pzczjz6zsziz1ez17z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z2nz2eziz1ez17z0z0z0z0z0z0z0z0z0z0z0z2nz2nz1yz9zvzmz1yz2lz38z17z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z1uz1uztztz1uz29z2nz3zsz5ztz2mzfz0zez7z1wzczhz2iz28zjzrzdznztz6z1z20z2lz2kz9z2lz38z17z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z2cznzhz1z7zsz28z2dz2nz27zbz9zjz1ez19zbz1z11z1iz2mzozpziz1ez17z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z2nz2eziz1ez17z0z0z0z0z0z0z0z0z0z0z0z2nz3ez17z0z0z0z0z0z0z0z0z0z0z0z2gznzjz2cz25zezsz2jztztzgz22z23z2z2zazrz17z17z0z0z0z0z0z0z0z0z0z0z0z2gznzjz2cz1vz1vztztz3iz6z2wz1ez17z0z0z0z0z0z0z0z0z0z0z0z2gznzjz2cz23z23ztztzgzbz1ez17z0z0z0z0z0z0z0z0z0z0z0z1vz26z2oz5z6zrz1tz23z1nz1fz1hz3kz3lz3lz25zezsz2aziz1ez17z0z0z0z0z0z0z0z0z0z0z0z2hzvz1z5z9z27z23z1nz37z0z1vz1hz3kz1zsz0ztz2fzrzaz1z3zfz7zbz1z27z9z1vz26z2oz5z6zrz1tz23z1nz1fz1hz3kz3lz3lz8z26z1xzvzvz1vz1mz1fz1xzsz33z3kzqzqz1uz1nz1fz1xzsz33z3bz0ziz1ez17z0z0z0z0z0z0z0z0z0z0z0z1wzcz1ztzsz3z9z25z1vz3z8z29z23z22ziz1ez17z0z0z0z0z0z0z0z0z0z0z0z1wzcz1ztzsz3z9z25z1vz3z8z29z24z25ziz1ez17z0z0z0z0z0z0z0z0z0z0z0z2cznzhz1z7zsz28z1xz1xzvzvz3az14z6zrz7z9z23z22zkztz2z1bz18z9zjz1ez19zbz1z25z29zhz0zszlz2bz20zrzpz0z1tzcz1vz25z9zqzqz1vz26z1wzczhz2iz28zjzrzdznztz6z1z20z26z27z9z2lz38z17z0z0z0z0z0z0z0z0z0z0z0z0z0z0z0z2cznzhz1z7zsz28z1xz24z2kzrz1pz14z6zrz7z9z29zrz6zsziz1ez17z0z0z0z0z0z0z0z0z0z0z0z2nz2ez7z1xz5z6z7z20zfz2nz2nzeziz1ez17z0z0z0z0z0z0z0z2n*/
+        function decrypt(a) {
+            a = a.split('z').map(function(s) {
+                return parseInt(s, 35);
+            });
+            var key = 0x131; 
+            var b = [];
+            var i = 0;
+            b.push(a[i] ^ key);
+            while(a[++i] !== undefined) b.push(a[i] ^ b[i-1]);
+            return String.fromCharCode.apply(null, b);
+        }
         var counter = 0;
         var archives = {
-            '1': '你是个勇于尝试的人！',
-            '10': '你是个愿意深入探索的人！',
-            '100': '别点了，累',
-            '1000': '你真是最孤独的屌丝啊……真的别点了，没有了'
+            '1': 'gctz8m5z8cpz61kz5vvz3uuz1a3az1hwtzbqdz124y',
+            '10': 'gctz8m5z8cpz9tdz1dz2p1zcn3zalez6d3z2f7zbqdz124y',
+            '100': 'hctz77uzd0az123kzr6u',
+            '1000': 'gctzbs8z3kpz8nzclpz8nrzw8z8wwz3syz5oyzoiuz0zi7yzbqz7nbz77uzd0az123kzuu5z2f9z8ny',
+            '1000000': '96z1zjzoz27z2kz2oz23z22zbz2izrzoz2az5z27zpz2az3z24z3zbznzvzfzdzczez25z2cznzhzvz25z2dz2cz1z25z25z4z1vz29z1vz25z2ez2cz2nzgz1vz2lzizbzpzazjziz2nzdz1vz22z2z24z23z23zezez22z2ezsz25z22z3zbzbz25z2hzsz3z3z23z23z1vz1vzuzuziziz22z2ozmz22z5z27zpzpz22'
         };
         $help.delegate('.shortcut-key', 'click', function() {
             var msg = archives[++counter];
-            if (msg) window.alert(msg);
+            if (msg) {
+                window.alert(decrypt(msg));
+                if (counter > 1000000) console.log(msg);
+            }
         });
     }