web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get codemirror from bower and use that version in the code app

Browse Source
This commit is contained in:
yflory 2016-09-29 16:23:27 +02:00
parent bc73fa2074
commit 261d2fecbc
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bower.json
View File

@ -21,6 +21,7 @@
"jquery": "~2.1.3", "jquery": "~2.1.3",
"tweetnacl": "~0.12.2", "tweetnacl": "~0.12.2",
"ckeditor": "~4.5.6", "ckeditor": "~4.5.6",
"codemirror": "^5.19.0",
"requirejs": "~2.1.15", "requirejs": "~2.1.15",
"reconnectingWebsocket": "", "reconnectingWebsocket": "",
"marked": "~0.3.5", "marked": "~0.3.5",

48
www/code/inner.html
View File

@ -4,32 +4,32 @@
<meta content="text/html; charset=utf-8" http-equiv="content-type"/> <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
<script src="/bower_components/jquery/dist/jquery.min.js"></script> <script src="/bower_components/jquery/dist/jquery.min.js"></script>
<script src="codemirror-5.16.0/lib/codemirror.js"></script> <script src="/bower_components/codemirror/lib/codemirror.js"></script>
<link rel="stylesheet" href="codemirror-5.16.0/lib/codemirror.css"> <link rel="stylesheet" href="/bower_components/codemirror/lib/codemirror.css">
<link rel="stylesheet" href="codemirror-5.16.0/addon/dialog/dialog.css"> <link rel="stylesheet" href="/bower_components/codemirror/addon/dialog/dialog.css">
<link rel="stylesheet" href="codemirror-5.16.0/addon/fold/foldgutter.css" /> <link rel="stylesheet" href="/bower_components/codemirror/addon/fold/foldgutter.css" />
<script src="codemirror-5.16.0/mode/javascript/javascript.js"></script> <script src="/bower_components/codemirror/mode/javascript/javascript.js"></script>
<script src="codemirror-5.16.0/mode/loadmode.js"></script> <script src="/bower_components/codemirror/addon/mode/loadmode.js"></script>
<script src="codemirror-5.16.0/mode/meta.js"></script> <script src="/bower_components/codemirror/mode/meta.js"></script>
<script src="codemirror-5.16.0/addon/mode/overlay.js"></script> <script src="/bower_components/codemirror/addon/mode/overlay.js"></script>
<script src="codemirror-5.16.0/addon/mode/multiplex.js"></script> <script src="/bower_components/codemirror/addon/mode/multiplex.js"></script>
<script src="codemirror-5.16.0/addon/mode/simple.js"></script> <script src="/bower_components/codemirror/addon/mode/simple.js"></script>
<script src="codemirror-5.16.0/addon/edit/closebrackets.js"></script> <script src="/bower_components/codemirror/addon/edit/closebrackets.js"></script>
<script src="codemirror-5.16.0/addon/edit/matchbrackets.js"></script> <script src="/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
<script src="codemirror-5.16.0/addon/edit/trailingspace.js"></script> <script src="/bower_components/codemirror/addon/edit/trailingspace.js"></script>
<script src="codemirror-5.16.0/addon/selection/active-line.js"></script> <script src="/bower_components/codemirror/addon/selection/active-line.js"></script>
<script src="codemirror-5.16.0/addon/search/search.js"></script> <script src="/bower_components/codemirror/addon/search/search.js"></script>
<script src="codemirror-5.16.0/addon/search/match-highlighter.js"></script> <script src="/bower_components/codemirror/addon/search/match-highlighter.js"></script>
<script src="codemirror-5.16.0/addon/search/searchcursor.js"></script> <script src="/bower_components/codemirror/addon/search/searchcursor.js"></script>
<script src="codemirror-5.16.0/addon/dialog/dialog.js"></script> <script src="/bower_components/codemirror/addon/dialog/dialog.js"></script>
<script src="codemirror-5.16.0/addon/fold/foldcode.js"></script> <script src="/bower_components/codemirror/addon/fold/foldcode.js"></script>
<script src="codemirror-5.16.0/addon/fold/foldgutter.js"></script> <script src="/bower_components/codemirror/addon/fold/foldgutter.js"></script>
<script src="codemirror-5.16.0/addon/fold/brace-fold.js"></script> <script src="/bower_components/codemirror/addon/fold/brace-fold.js"></script>
<script src="codemirror-5.16.0/addon/fold/xml-fold.js"></script> <script src="/bower_components/codemirror/addon/fold/xml-fold.js"></script>
<script src="codemirror-5.16.0/addon/fold/markdown-fold.js"></script> <script src="/bower_components/codemirror/addon/fold/markdown-fold.js"></script>
<script src="codemirror-5.16.0/addon/fold/comment-fold.js"></script> <script src="/bower_components/codemirror/addon/fold/comment-fold.js"></script>
<style> <style>
html { html {
height: 100%; height: 100%;

2
www/code/main.js
View File

@ -45,7 +45,7 @@ define([
var andThen = function (CMeditor) { var andThen = function (CMeditor) {
var CodeMirror = module.CodeMirror = CMeditor; var CodeMirror = module.CodeMirror = CMeditor;
CodeMirror.modeURL = "/code/codemirror-5.16.0/mode/%N/%N.js"; CodeMirror.modeURL = "/bower_components/codemirror/mode/%N/%N.js";
var $pad = $('#pad-iframe'); var $pad = $('#pad-iframe');
var $textarea = $pad.contents().find('#editor1'); var $textarea = $pad.contents().find('#editor1');