xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

leaui image fix bugs

Browse Source
This commit is contained in:
life
2014-07-15 20:55:28 +08:00
parent 7db9d95108
commit fe10dbbd77
11 changed files with 154 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/views/Note/note-dev.html
View File

@ -488,47 +488,17 @@ function log(o) {
<div id="leanoteNavContent">
</div>
</div>
<style>
#upload {
position: absolute;
z-index: 0;
bottom: 0;
right: 0;
left: 0px;
padding: 0;
background-color: #fff;
text-align: center;
display: none;
}
#upload #drop {
width: 100%;
height: 100%;
padding-top: 100px;
}
#drop.in {
border: 1px solid #000000;
}
#drop.hover {
border: 2px solid #000000;
}
#uploadMsg {
position: absolute;
top: 3px;
right: 3px;
bottom: 10px;
overflow: scroll;
list-style: none;
}
</style>
<form id="upload" method="post" action="/file/uploadImageLeaui" enctype="multipart/form-data" style="margin-top: 5px;">
<div id="drop">
Drop images to here
<input type="file" name="file" multiple style="display: none"/>
</div>
<ul id="uploadMsg">
</ul>
</form>
<!-- leaui image -->
<form id="upload" method="post" action="/file/uploadImageLeaui" enctype="multipart/form-data" style="margin-top: 5px;">
<div id="drop">
Drop images to here
<input type="file" name="file" multiple style="display: none"/>
</div>
<ul id="uploadMsg">
</ul>
</form>
<!-- 由此可以算高度 -->
<div id="editorContent" name="editorContent" tabindex="2" />
{{.noteContent}}

52
app/views/Note/note.html
View File

@ -488,47 +488,17 @@ function log(o) {
<div id="leanoteNavContent">
</div>
</div>
<style>
#upload {
position: absolute;
z-index: 0;
bottom: 0;
right: 0;
left: 0px;
padding: 0;
background-color: #fff;
text-align: center;
display: none;
}
#upload #drop {
width: 100%;
height: 100%;
padding-top: 100px;
}
#drop.in {
border: 1px solid #000000;
}
#drop.hover {
border: 2px solid #000000;
}
#uploadMsg {
position: absolute;
top: 3px;
right: 3px;
bottom: 10px;
overflow: scroll;
list-style: none;
}
</style>
<form id="upload" method="post" action="/file/uploadImageLeaui" enctype="multipart/form-data" style="margin-top: 5px;">
<div id="drop">
Drop images to here
<input type="file" name="file" multiple style="display: none"/>
</div>
<ul id="uploadMsg">
</ul>
</form>
<!-- leaui image -->
<form id="upload" method="post" action="/file/uploadImageLeaui" enctype="multipart/form-data" style="margin-top: 5px;">
<div id="drop">
Drop images to here
<input type="file" name="file" multiple style="display: none"/>
</div>
<ul id="uploadMsg">
</ul>
</form>
<!-- 由此可以算高度 -->
<div id="editorContent" name="editorContent" tabindex="2" />
{{.noteContent}}

2
public/css/theme/default.css
View File

File diff suppressed because one or more lines are too long

32
public/css/theme/default.less
View File

@ -1210,4 +1210,36 @@ background-position:-1px -670px
#toggleEditorMode {
margin: 0 10px !important;
}
// leaui image drop drag
#upload {
position: absolute;
z-index: 0;
bottom: 0;
right: 0;
left: 0px;
padding: 0;
background-color: #fff;
text-align: center;
display: none;
}
#upload #drop {
width: 100%;
height: 100%;
padding-top: 100px;
}
#drop.in {
border: 1px solid #000000;
}
#drop.hover {
border: 2px solid #000000;
}
#uploadMsg {
position: absolute;
top: 3px;
right: 3px;
bottom: 10px;
overflow: scroll;
list-style: none;
}

2
public/css/theme/simple.css
View File

File diff suppressed because one or more lines are too long

33
public/css/theme/simple.less
View File

@ -1169,4 +1169,37 @@ background-position:-1px -670px
#toggleEditorMode {
margin: 0 10px !important;
}
// leaui image drop drag
#upload {
position: absolute;
z-index: 0;
bottom: 0;
right: 0;
left: 0px;
padding: 0;
background-color: #fff;
text-align: center;
display: none;
}
#upload #drop {
width: 100%;
height: 100%;
padding-top: 100px;
}
#drop.in {
border: 1px solid #000000;
}
#drop.hover {
border: 2px solid #000000;
}
#uploadMsg {
position: absolute;
top: 3px;
right: 3px;
bottom: 10px;
overflow: scroll;
list-style: none;
}

8
public/css/theme/writting-overwrite.css
View File

@ -72,13 +72,10 @@ a.raw:hover {
color: #ffffff;
border-bottom: 1px solid #ebeff2;
/* for app */
webkit-user-select: none;
/* 还不知 */
-webkit-app-region: drag;
/* -webkit-app-region: no-drag; */
}
#header a {
color: #ccc;
@ -290,7 +287,6 @@ a.raw:hover {
}
.item-title {
/*font-weight: 400;*/
font-size: 16px;
height: 22px;
line-height: 20px;
@ -345,9 +341,7 @@ a.raw:hover {
border: none;
overflow: hidden !important;
/*不知道哪里设置了auto*/
/*border-radius: 5px;*/
}
/* 最顶层 */
#editor .mce-tinymce {
@ -449,7 +443,6 @@ a.raw:hover {
cursor: pointer;
font-style: normal;
/*border-left: 1px solid #ccc;*/
display: inline-block;
padding-left: 3px;
opacity: 0;
@ -911,7 +904,6 @@ body {
}
}
*/
}
#noteList #notesAndSort {
display: none;

37
public/css/theme/writting.css
View File

@ -72,13 +72,10 @@ a.raw:hover {
color: #ffffff;
border-bottom: 1px solid #ebeff2;
/* for app */
webkit-user-select: none;
/* 还不知 */
-webkit-app-region: drag;
/* -webkit-app-region: no-drag; */
}
#header a {
color: #ccc;
@ -290,7 +287,6 @@ a.raw:hover {
}
.item-title {
/*font-weight: 400;*/
font-size: 16px;
height: 22px;
line-height: 20px;
@ -345,9 +341,7 @@ a.raw:hover {
border: none;
overflow: hidden !important;
/*不知道哪里设置了auto*/
/*border-radius: 5px;*/
}
/* 最顶层 */
#editor .mce-tinymce {
@ -449,7 +443,6 @@ a.raw:hover {
cursor: pointer;
font-style: normal;
/*border-left: 1px solid #ccc;*/
display: inline-block;
padding-left: 3px;
opacity: 0;
@ -741,3 +734,33 @@ background-position:-1px -670px
background-color: #65bd77;
color: #fff;
}
#upload {
position: absolute;
z-index: 0;
bottom: 0;
right: 0;
left: 0px;
padding: 0;
background-color: #fff;
text-align: center;
display: none;
}
#upload #drop {
width: 100%;
height: 100%;
padding-top: 100px;
}
#drop.in {
border: 1px solid #000000;
}
#drop.hover {
border: 2px solid #000000;
}
#uploadMsg {
position: absolute;
top: 3px;
right: 3px;
bottom: 10px;
overflow: scroll;
list-style: none;
}

33
public/css/theme/writting.less
View File

@ -830,3 +830,36 @@ background-position:-1px -670px
}
}
}
// leaui image drop drag
#upload {
position: absolute;
z-index: 0;
bottom: 0;
right: 0;
left: 0px;
padding: 0;
background-color: #fff;
text-align: center;
display: none;
}
#upload #drop {
width: 100%;
height: 100%;
padding-top: 100px;
}
#drop.in {
border: 1px solid #000000;
}
#drop.hover {
border: 2px solid #000000;
}
#uploadMsg {
position: absolute;
top: 3px;
right: 3px;
bottom: 10px;
overflow: scroll;
list-style: none;
}

1
public/js/app/min/page-ck.js
View File

File diff suppressed because one or more lines are too long

4
public/tinymce/plugins/leaui_image/public/js/for_editor.js
View File

@ -159,8 +159,8 @@ define('leaui_image', ['jquery.ui.widget', 'fileupload'], function(){
$("#upload").show();
}
function hideUpload() {
$("#upload").css("z-index", 0).css("top", "auto");
function hideUpload() {
$("#upload").css("z-index", 0).css("top", "auto").hide();
}
// drag css