opt, fix 1.1
This commit is contained in:
app/views/home
public
@ -15,9 +15,9 @@
|
|||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<i class="fa fa-globe fa-3x icon-muted"></i>
|
<i class="fa fa-globe fa-3x icon-muted"></i>
|
||||||
<h2>Join Us</h2>
|
<h2>Join Us</h2>
|
||||||
<a href="https://github.com/leanote/leanote">github leanote</a>
|
<a href="https://github.com/leanote/leanote">Github Leanote</a>
|
||||||
<br />
|
<br />
|
||||||
QQ Group: 158716820
|
QQ Group: 158716820, 158716820
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
2
public/js/dep.min.js
vendored
2
public/js/dep.min.js
vendored
File diff suppressed because one or more lines are too long
@ -292,7 +292,6 @@ define('editor_drop_paste', ['jquery.ui.widget', 'fileupload'], function(){
|
|||||||
add: function(e, data) {
|
add: function(e, data) {
|
||||||
// 防止两次
|
// 防止两次
|
||||||
var now = (new Date()).getTime();
|
var now = (new Date()).getTime();
|
||||||
console.log(now - lastTime);
|
|
||||||
if (now - lastTime < 500) {
|
if (now - lastTime < 500) {
|
||||||
// console.log('haha');
|
// console.log('haha');
|
||||||
return;
|
return;
|
||||||
|
2
public/js/plugins/main.min.js
vendored
2
public/js/plugins/main.min.js
vendored
File diff suppressed because one or more lines are too long
@ -41253,8 +41253,9 @@ define("tinymce/pasteplugin/Clipboard", [
|
|||||||
ajaxPost("/file/copyHttpImage", {src: src}, function(ret) {
|
ajaxPost("/file/copyHttpImage", {src: src}, function(ret) {
|
||||||
if(reIsOk(ret)) {
|
if(reIsOk(ret)) {
|
||||||
// 将图片替换之
|
// 将图片替换之
|
||||||
var src = urlPrefix + "/" + ret.Item;
|
// var src = urlPrefix + "/" + ret.Item;
|
||||||
var dom = editor.dom
|
var src = urlPrefix + "/file/outputImage?fileId=" + ret.Id;
|
||||||
|
var dom = editor.dom;
|
||||||
for(var i in ids) {
|
for(var i in ids) {
|
||||||
var id = ids[i];
|
var id = ids[i];
|
||||||
var imgElm = dom.get(id);
|
var imgElm = dom.get(id);
|
||||||
@ -41320,7 +41321,7 @@ define("tinymce/pasteplugin/Clipboard", [
|
|||||||
var needCopyImages = {}; // src => [id1,id2]
|
var needCopyImages = {}; // src => [id1,id2]
|
||||||
var time = (new Date()).getTime();
|
var time = (new Date()).getTime();
|
||||||
try {
|
try {
|
||||||
var $html = $("<div>" + html + "</div");
|
var $html = $("<div>" + html + "</div>");
|
||||||
var $imgs = $html.find("img");
|
var $imgs = $html.find("img");
|
||||||
for(var i = 0; i < $imgs.length; ++i) {
|
for(var i = 0; i < $imgs.length; ++i) {
|
||||||
var $img = $imgs.eq(i)
|
var $img = $imgs.eq(i)
|
||||||
@ -42124,26 +42125,11 @@ define("tinymce/pasteplugin/Plugin", [
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function togglePasteCopyImage() {
|
|
||||||
if (clipboard.copyImage) {
|
|
||||||
this.active(false);
|
|
||||||
clipboard.copyImage = false
|
|
||||||
} else {
|
|
||||||
clipboard.copyImage = true;
|
|
||||||
this.active(true);
|
|
||||||
if (!userIsInformed2) {
|
|
||||||
editor.windowManager.alert(
|
|
||||||
"When copy other site's images (not in leanote) into editor, it will copy the image into your album."
|
|
||||||
);
|
|
||||||
userIsInformed2 = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
self.clipboard = clipboard = new Clipboard(editor);
|
self.clipboard = clipboard = new Clipboard(editor);
|
||||||
self.quirks = new Quirks(editor);
|
self.quirks = new Quirks(editor);
|
||||||
self.wordFilter = new WordFilter(editor);
|
self.wordFilter = new WordFilter(editor);
|
||||||
|
clipboard.copyImage = true;
|
||||||
|
|
||||||
if (editor.settings.paste_as_text) {
|
if (editor.settings.paste_as_text) {
|
||||||
self.clipboard.pasteFormat = "text";
|
self.clipboard.pasteFormat = "text";
|
||||||
@ -42196,13 +42182,6 @@ define("tinymce/pasteplugin/Plugin", [
|
|||||||
onclick: togglePlainTextPaste,
|
onclick: togglePlainTextPaste,
|
||||||
active: self.clipboard.pasteFormat == "text"
|
active: self.clipboard.pasteFormat == "text"
|
||||||
});
|
});
|
||||||
|
|
||||||
editor.addButton('pasteCopyImage', {
|
|
||||||
icon: 'copy',
|
|
||||||
tooltip: "When Paste other site's image, copy it into my album as public image",
|
|
||||||
onclick: togglePasteCopyImage,
|
|
||||||
active: self.clipboard.copyImage === true
|
|
||||||
});
|
|
||||||
|
|
||||||
editor.addMenuItem('pastetext', {
|
editor.addMenuItem('pastetext', {
|
||||||
text: 'Paste as text',
|
text: 'Paste as text',
|
||||||
|
2
public/tinymce/tinymce.full.min.js
vendored
2
public/tinymce/tinymce.full.min.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user