fix bugs & update .gitinore

11 years ago · 0e2d7b09c7
15 changed files with 12 additions and 74 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,4 +11,5 @@ examples/uploads/
 *.bat
 *.sh
 .project
-.url
+.url
+css/*.map
--- a/css/editormd.css.map
+++ b/css/editormd.css.map
--- a/css/editormd.css.min.map
+++ b/css/editormd.css.min.map
--- a/css/editormd.logo.css.map
+++ b/css/editormd.logo.css.map
@ -1,19 +0,0 @@
-/*
- * Editor.md
- *
- * @file        editormd.logo.css.map 
- * @version     v1.3.0 
- * @description A simple online markdown editor.
- * @license     MIT License
- * @author      Pandao
- * {@link       https://github.com/pandao/editor.md}
- * @updateTime  2015-03-12
- */
-
-{
-"version": 3,
-"mappings": ";;;;;;;;AAKA,UASC;EARA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAC,yCAAyC;EAC7C,GAAG,EAAC,sQAA4E;EAIhF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;;AAGnB;;;;;;;;iBAQkB;EACjB,WAAW,EAAE,eAAe;EAC5B,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EACnB,YAAY,EAAE,MAAM;EACpB,cAAc,EAAE,IAAI;EACjB,SAAS,EAAE,OAAO;EACrB,WAAW,EAAE,CAAC;EACX,OAAO,EAAE,YAAY;EACrB,cAAc,EAAE,IAAI;EACpB,cAAc,EAAE,OAAO;EAG1B,sBAAsB,EAAE,WAAW;EACnC,uBAAuB,EAAE,SAAS;;AAE/B;;;;;;;;wBAAS;EACL,OAAO,EAAE,QAAQ;;;;;;;AAQzB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,KAAK;;;AAGpB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,oBAAqB;EACjB,KAAK,EChFO,OAAU",
-"sources": ["../editormd.logo.scss","file:///D:/APMServ/www/htdocs/editor.md/scss/lib/variables.scss"],
-"names": [],
-"file": "editormd.logo.css"
-}
--- a/css/editormd.logo.css.min.map
+++ b/css/editormd.logo.css.min.map
@ -1,2 +0,0 @@
-/*! Editor.md v1.3.0 | editormd.logo.css.min.map | A simple online markdown editor. | MIT License | By: Pandao | https://github.com/pandao/editor.md | 2015-03-12 */
-{"version":3,"mappings":";;;;;;;;AAKA,UASC;EARA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAC,yCAAyC;EAC7C,GAAG,EAAC,sQAA4E;EAIhF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;;AAGnB;;;;;;;;iBAQkB;EACjB,WAAW,EAAE,eAAe;EAC5B,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EACnB,YAAY,EAAE,MAAM;EACpB,cAAc,EAAE,IAAI;EACjB,SAAS,EAAE,OAAO;EACrB,WAAW,EAAE,CAAC;EACX,OAAO,EAAE,YAAY;EACrB,cAAc,EAAE,IAAI;EACpB,cAAc,EAAE,OAAO;EAG1B,sBAAsB,EAAE,WAAW;EACnC,uBAAuB,EAAE,SAAS;;AAE/B;;;;;;;;wBAAS;EACL,OAAO,EAAE,QAAQ;;;;;;;AAQzB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,KAAK;;;AAGpB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,iBAAkB;EACd,SAAS,EAAE,GAAG;;;AAGlB,oBAAqB;EACjB,KAAK,EChFO,OAAU","sources"["../editormd.logo.scss","file:///D:/APMServ/www/htdocs/editor.md/scss/lib/variables.scss"],"names"[],"file":"editormd.logo.css"}
--- a/css/editormd.preview.css.map
+++ b/css/editormd.preview.css.map
--- a/css/editormd.preview.css.min.map
+++ b/css/editormd.preview.css.min.map
--- a/editormd.amd.js
+++ b/editormd.amd.js
@ -919,7 +919,7 @@
                    return false;
                }

-                if (top - editor.offset().top > 10)
+                if (top - editor.offset().top > 10 && top < editor.height())
                {
                    toolbar.css({
                        position : "fixed",
--- a/editormd.amd.min.js
+++ b/editormd.amd.min.js
--- a/editormd.amd.min.js.map
+++ b/editormd.amd.min.js.map
--- a/editormd.js
+++ b/editormd.js
@ -849,7 +849,7 @@
                    return false;
                }

-                if (top - editor.offset().top > 10)
+                if (top - editor.offset().top > 10 && top < editor.height())
                {
                    toolbar.css({
                        position : "fixed",
--- a/editormd.min.js
+++ b/editormd.min.js
--- a/editormd.min.js.map
+++ b/editormd.min.js.map
--- a/examples/toolbar-auto-fixed.html
+++ b/examples/toolbar-auto-fixed.html
@ -8,7 +8,7 @@
        <link rel="shortcut icon" href="https://pandao.github.io/editor.md/favicon.ico" type="image/x-icon" />
    </head>
    <body>
-        <div id="layout">
+        <div id="layout" style="height:3000px;">
            <header>
                <h1>工具栏自动固定定位的开启与禁用</h1>
                <p>Enable / disable toolbar auto fixed position.</p>
@ -101,7 +101,7 @@ Bower Distribution of the Sparqlification Mapping Language (SML) Syntax Highligh
            $(function() {
                testEditor = editormd("test-editormd", {
                    width  : "90%",
-                    height : 1800,
+                    height : 1600,
                    path   : "../lib/"
                });
                
--- a/src/editormd.js
+++ b/src/editormd.js
@ -837,7 +837,7 @@
                    return false;
                }

-                if (top - editor.offset().top > 10)
+                if (top - editor.offset().top > 10 && top < editor.height())
                {
                    toolbar.css({
                        position : "fixed",