momo
/
editor.md
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix bugs & update .gitinore

master
Pandao 10 years ago
parent
c33e05e567
commit
0e2d7b09c7
15 changed files with 12 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .gitignore
  2. 19
      css/editormd.css.map
  3. 2
      css/editormd.css.min.map
  4. 19
      css/editormd.logo.css.map
  5. 2
      css/editormd.logo.css.min.map
  6. 19
      css/editormd.preview.css.map
  7. 2
      css/editormd.preview.css.min.map
  8. 2
      editormd.amd.js
  9. 2
      editormd.amd.min.js
  10. 2
      editormd.amd.min.js.map
  11. 2
      editormd.js
  12. 4
      editormd.min.js
  13. 2
      editormd.min.js.map
  14. 4
      examples/toolbar-auto-fixed.html
  15. 2
      src/editormd.js

3
.gitignore
View File

@ -11,4 +11,5 @@ examples/uploads/
*.bat *.bat
*.sh *.sh
.project .project
.url
.url
css/*.map

19
css/editormd.css.map
View File

File diff suppressed because one or more lines are too long

2
css/editormd.css.min.map
View File

File diff suppressed because one or more lines are too long

19
css/editormd.logo.css.map
View File

@ -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"
}

2
css/editormd.logo.css.min.map
View File

@ -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"}

19
css/editormd.preview.css.map
View File

File diff suppressed because one or more lines are too long

2
css/editormd.preview.css.min.map
View File

File diff suppressed because one or more lines are too long

2
editormd.amd.js
View File

@ -919,7 +919,7 @@
return false; return false;
} }
if (top - editor.offset().top > 10)
if (top - editor.offset().top > 10 && top < editor.height())
{ {
toolbar.css({ toolbar.css({
position : "fixed", position : "fixed",

2
editormd.amd.min.js
View File

File diff suppressed because one or more lines are too long

2
editormd.amd.min.js.map
View File

File diff suppressed because one or more lines are too long

2
editormd.js
View File

@ -849,7 +849,7 @@
return false; return false;
} }
if (top - editor.offset().top > 10)
if (top - editor.offset().top > 10 && top < editor.height())
{ {
toolbar.css({ toolbar.css({
position : "fixed", position : "fixed",

4
editormd.min.js
View File

File diff suppressed because one or more lines are too long

2
editormd.min.js.map
View File

File diff suppressed because one or more lines are too long

4
examples/toolbar-auto-fixed.html
View File

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

2
src/editormd.js
View File

@ -837,7 +837,7 @@
return false; return false;
} }
if (top - editor.offset().top > 10)
if (top - editor.offset().top > 10 && top < editor.height())
{ {
toolbar.css({ toolbar.css({
position : "fixed", position : "fixed",

Write Preview
Loading…
Cancel
Save