stephen/caddy-hugo2
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

making the image button of the editor actually add all the info needed, and made the images clickable for the full size

Browse Source
This commit is contained in:
stephen
2017-07-16 18:30:04 -07:00
parent 5897b6874d
commit ab6152cbfa
10 changed files with 19031 additions and 17837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/bindata.go
+18 -41
View File
File diff suppressed because one or more lines are too long
assets/simplemde/debug/simplemde.css
+16 -14
View File
@@ -94,8 +94,14 @@
.cm-tab { display: inline-block; text-decoration: inherit; } .cm-tab { display: inline-block; text-decoration: inherit; }
.CodeMirror-rulers {
position: absolute;
left: 0; right: 0; top: -50px; bottom: -20px;
overflow: hidden;
}
.CodeMirror-ruler { .CodeMirror-ruler {
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
top: 0; bottom: 0;
position: absolute; position: absolute;
} }
@@ -206,9 +212,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
margin-bottom: -30px; margin-bottom: -30px;
/* Hack to make IE7 behave */
*zoom:1;
*display:inline;
} }
.CodeMirror-gutter-wrapper { .CodeMirror-gutter-wrapper {
position: absolute; position: absolute;
@@ -226,11 +229,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
cursor: default; cursor: default;
z-index: 4; z-index: 4;
} }
.CodeMirror-gutter-wrapper { .CodeMirror-gutter-wrapper ::selection { background-color: transparent }
-webkit-user-select: none; .CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
-moz-user-select: none;
user-select: none;
}
.CodeMirror-lines { .CodeMirror-lines {
cursor: text; cursor: text;
@@ -252,8 +252,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
position: relative; position: relative;
overflow: visible; overflow: visible;
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;
-webkit-font-variant-ligatures: none; -webkit-font-variant-ligatures: contextual;
font-variant-ligatures: none; font-variant-ligatures: contextual;
} }
.CodeMirror-wrap pre { .CodeMirror-wrap pre {
word-wrap: break-word; word-wrap: break-word;
@@ -275,6 +275,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
.CodeMirror-widget {} .CodeMirror-widget {}
.CodeMirror-rtl pre { direction: rtl; }
.CodeMirror-code { .CodeMirror-code {
outline: none; outline: none;
} }
@@ -297,7 +299,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
visibility: hidden; visibility: hidden;
} }
.CodeMirror-cursor { position: absolute; } .CodeMirror-cursor {
position: absolute;
pointer-events: none;
}
.CodeMirror-measure pre { position: static; } .CodeMirror-measure pre { position: static; }
div.CodeMirror-cursors { div.CodeMirror-cursors {
@@ -324,9 +329,6 @@ div.CodeMirror-dragcursors {
background: rgba(255, 255, 0, .4); background: rgba(255, 255, 0, .4);
} }
/* IE7 hack to prevent it from returning funny offsetTops on the spans */
.CodeMirror span { *vertical-align: text-bottom; }
/* Used to force a border model for a node */ /* Used to force a border model for a node */
.cm-force-border { padding-right: .1px; } .cm-force-border { padding-right: .1px; }
assets/simplemde/debug/simplemde.debug.js
+9482 -8880
View File
File diff suppressed because one or more lines are too long
assets/simplemde/debug/simplemde.js
+9482 -8881
View File
File diff suppressed because it is too large Load Diff
assets/simplemde/dist/simplemde.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/simplemde/dist/simplemde.min.js
Vendored
+1 -9
View File
File diff suppressed because one or more lines are too long
assets/simplemde/gulpfile.js
+3 -3
View File
@@ -47,7 +47,7 @@ function taskBrowserify(opts) {
.bundle(); .bundle();
} }
gulp.task("browserify:debug", ["lint"], function() { gulp.task("browserify:debug", [], function() {
return taskBrowserify({debug:true, standalone:"SimpleMDE"}) return taskBrowserify({debug:true, standalone:"SimpleMDE"})
.pipe(source("simplemde.debug.js")) .pipe(source("simplemde.debug.js"))
.pipe(buffer()) .pipe(buffer())
@@ -55,7 +55,7 @@ gulp.task("browserify:debug", ["lint"], function() {
.pipe(gulp.dest("./debug/")); .pipe(gulp.dest("./debug/"));
}); });
gulp.task("browserify", ["lint"], function() { gulp.task("browserify", [], function() {
return taskBrowserify({standalone:"SimpleMDE"}) return taskBrowserify({standalone:"SimpleMDE"})
.pipe(source("simplemde.js")) .pipe(source("simplemde.js"))
.pipe(buffer()) .pipe(buffer())
@@ -63,7 +63,7 @@ gulp.task("browserify", ["lint"], function() {
.pipe(gulp.dest("./debug/")); .pipe(gulp.dest("./debug/"));
}); });
gulp.task("scripts", ["browserify:debug", "browserify", "lint"], function() { gulp.task("scripts", ["browserify:debug", "browserify"], function() {
var js_files = ["./debug/simplemde.js"]; var js_files = ["./debug/simplemde.js"];
return gulp.src(js_files) return gulp.src(js_files)
assets/simplemde/src/js/simplemde.js
+8 -5
View File
@@ -635,11 +635,14 @@ function drawImage(editor) {
var stat = getState(cm); var stat = getState(cm);
var options = editor.options; var options = editor.options;
var url = "http://"; var url = "http://";
if(options.promptURLs) { if(options.imageURLFn) {
url = options.imageURLFn();
} else if(options.promptURLs) {
url = prompt(options.promptTexts.image); url = prompt(options.promptTexts.image);
if(!url) { }
return false;
} if(!url) {
return false;
} }
_replaceSelection(cm, stat.image, options.insertTexts.image, url); _replaceSelection(cm, stat.image, options.insertTexts.image, url);
} }
@@ -2026,4 +2029,4 @@ SimpleMDE.prototype.toTextArea = function() {
} }
}; };
module.exports = SimpleMDE; module.exports = SimpleMDE;
media.go
+5 -2
View File
@@ -245,7 +245,7 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int
<head><style> <head><style>
iframe { height: 100%; } iframe { height: 100%; }
.img { display: inline-block; text-align: center; max-width: 19.9vw; min-height: 120px;} .img { display: inline-block; text-align: center; max-width: 19.9vw; min-height: 120px;}
.img.selected { background-color: light-blue; } .img.selected { background-color: lightblue; }
.copy { cursor: pointer; } .copy { cursor: pointer; }
@media (max-width: 800px) { @media (max-width: 800px) {
.img { .img {
@@ -279,7 +279,7 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int
fmt.Fprintf(w, `<div class="img">error rendering %q: %v</div>`, m.Name, err) fmt.Fprintf(w, `<div class="img">error rendering %q: %v</div>`, m.Name, err)
continue continue
} }
fmt.Fprintf(w, `<div class="img"><img width=%d height=%d src=%q /><br /><input type="text" readonly value=%q /><span class="copy">&#x1F4CB;</span></div>`, size.Dx(), size.Dy(), src, src) fmt.Fprintf(w, `<div class="img"><img width=%d height=%d src=%q data-filename=%q /><br /><input type="text" readonly value=%q /><span class="copy">&#x1F4CB;</span></div>`, size.Dx(), size.Dy(), src, m.Name, src)
} }
} }
io.WriteString(w, `<script> io.WriteString(w, `<script>
@@ -297,6 +297,9 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int
current.classList = "img"; current.classList = "img";
} }
evt.target.parentElement.classList = "img selected"; evt.target.parentElement.classList = "img selected";
if (window.parent) {
window.parent.postMessage(evt.target.dataset.filename, location.origin);
}
} }
} }
document.querySelector('body').onmouseup = function (evt) { document.querySelector('body').onmouseup = function (evt) {
templates.go
+15 -1
View File
@@ -216,8 +216,22 @@ a {
} }
} }
var selectedImage;
var editorElem = document.getElementById("editor"); var editorElem = document.getElementById("editor");
var editor = new SimpleMDE({element: editorElem, forceSync: true}); var editor = new SimpleMDE({
element: editorElem,
forceSync: true,
insertTexts: {
image: ["{\{% thumb filename=\"", "#url#\" width=\"200\" %}}"]
},
imageURLFn: function () {
return selectedImage;
}
});
window.onmessage = function (evt) {
selectedImage = evt.data;
}
// Create WebSocket connection. // Create WebSocket connection.