hellmund/markdown-preview-mode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WS host/port injection fixes #14

Browse Source
This commit is contained in:
Igor Shymko 2016-12-05 13:19:43 +02:00
parent c9c9bfb449
commit c415d7e4a7
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
markdown-preview-mode.el
View File

@ -40,11 +40,10 @@
:prefix "markdown-preview-" :prefix "markdown-preview-"
:link '(url-link "https://github.com/ancane/markdown-preview-mode")) :link '(url-link "https://github.com/ancane/markdown-preview-mode"))
(defcustom markdown-preview-host 'local (defcustom markdown-preview-host "localhost"
"Markdown preview websocket server address." "Markdown preview websocket server address."
:group 'markdown-preview :group 'markdown-preview
:type '(choice (const :tag "localhost" local) :type 'string)
(string :tag "Custom host")))
(defcustom markdown-preview-port 7379 (defcustom markdown-preview-port 7379
"Markdown preview websocket server port." "Markdown preview websocket server port."
@ -71,9 +70,9 @@
(defvar markdown-preview--remote-clients nil (defvar markdown-preview--remote-clients nil
"List of `markdown-preview' websocket remote clients.") "List of `markdown-preview' websocket remote clients.")
(defvar markdown-preview--preview-url (defvar markdown-preview--preview-template
(concat (file-name-directory load-file-name) "preview.html") (concat (file-name-directory load-file-name) "preview.html")
"Location of `markdown-preview' html.") "Location of `markdown-preview' html template file.")
(defvar markdown-preview--idle-timer nil (defvar markdown-preview--idle-timer nil
"Preview idle timer.") "Preview idle timer.")
@ -87,8 +86,13 @@
"Open the markdown preview in the browser." "Open the markdown preview in the browser."
(let* ((dir-of-buffer-to-preview (file-name-directory (buffer-file-name))) (let* ((dir-of-buffer-to-preview (file-name-directory (buffer-file-name)))
(preview-file (concat dir-of-buffer-to-preview markdown-preview-file-name))) (preview-file (concat dir-of-buffer-to-preview markdown-preview-file-name)))
(if (not (file-exists-p preview-file)) (with-temp-file preview-file
(copy-file markdown-preview--preview-url preview-file)) (insert-file-contents markdown-preview--preview-template)
(if (search-forward "${WS_HOST}" nil t)
(replace-match markdown-preview-host t))
(if (search-forward "${WS_PORT}" nil t)
(replace-match (format "%s" markdown-preview-port) t))
(buffer-string))
(browse-url preview-file))) (browse-url preview-file)))
(defun markdown-preview--stop-websocket-server () (defun markdown-preview--stop-websocket-server ()

2
preview.html
View File

@ -13,7 +13,7 @@
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script> <script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
<script> <script>
(function($, undefined) { (function($, undefined) {
var socket = new WebSocket("ws://localhost:7379"); var socket = new WebSocket("ws://${WS_HOST}:${WS_PORT}");
socket.onopen = function() { socket.onopen = function() {
console.log("Connection established."); console.log("Connection established.");
}; };