diff --git a/LICENSE.md b/LICENSE.md --- a/LICENSE.md +++ b/LICENSE.md @@ -52,7 +52,7 @@ and licensed under the MIT-permissive li Additional files from upstream Codemirror are copyrighted by various authors and licensed under other permissive licenses. The sub-directories under -[.../public/js/mode/](kallithea/public/js/mode) include the copyright and +[.../public/codemirror](kallithea/public/codemirror) include the copyright and license notice and information as they appeared in Codemirror's upstream release. diff --git a/kallithea/public/css/codemirror.css b/kallithea/public/codemirror/lib/codemirror.css rename from kallithea/public/css/codemirror.css rename to kallithea/public/codemirror/lib/codemirror.css diff --git a/kallithea/public/js/codemirror.js b/kallithea/public/codemirror/lib/codemirror.js rename from kallithea/public/js/codemirror.js rename to kallithea/public/codemirror/lib/codemirror.js diff --git a/kallithea/public/js/mode/apl/apl.js b/kallithea/public/codemirror/mode/apl/apl.js rename from kallithea/public/js/mode/apl/apl.js rename to kallithea/public/codemirror/mode/apl/apl.js diff --git a/kallithea/public/js/mode/apl/index.html b/kallithea/public/codemirror/mode/apl/index.html rename from kallithea/public/js/mode/apl/index.html rename to kallithea/public/codemirror/mode/apl/index.html diff --git a/kallithea/public/js/mode/asterisk/asterisk.js b/kallithea/public/codemirror/mode/asterisk/asterisk.js rename from kallithea/public/js/mode/asterisk/asterisk.js rename to kallithea/public/codemirror/mode/asterisk/asterisk.js diff --git a/kallithea/public/js/mode/asterisk/index.html b/kallithea/public/codemirror/mode/asterisk/index.html rename from kallithea/public/js/mode/asterisk/index.html rename to kallithea/public/codemirror/mode/asterisk/index.html diff --git a/kallithea/public/js/mode/clike/clike.js b/kallithea/public/codemirror/mode/clike/clike.js rename from kallithea/public/js/mode/clike/clike.js rename to kallithea/public/codemirror/mode/clike/clike.js diff --git a/kallithea/public/js/mode/clike/index.html b/kallithea/public/codemirror/mode/clike/index.html rename from kallithea/public/js/mode/clike/index.html rename to kallithea/public/codemirror/mode/clike/index.html diff --git a/kallithea/public/js/mode/clike/scala.html b/kallithea/public/codemirror/mode/clike/scala.html rename from kallithea/public/js/mode/clike/scala.html rename to kallithea/public/codemirror/mode/clike/scala.html diff --git a/kallithea/public/js/mode/clojure/clojure.js b/kallithea/public/codemirror/mode/clojure/clojure.js rename from kallithea/public/js/mode/clojure/clojure.js rename to kallithea/public/codemirror/mode/clojure/clojure.js diff --git a/kallithea/public/js/mode/clojure/index.html b/kallithea/public/codemirror/mode/clojure/index.html rename from kallithea/public/js/mode/clojure/index.html rename to kallithea/public/codemirror/mode/clojure/index.html diff --git a/kallithea/public/js/mode/cobol/cobol.js b/kallithea/public/codemirror/mode/cobol/cobol.js rename from kallithea/public/js/mode/cobol/cobol.js rename to kallithea/public/codemirror/mode/cobol/cobol.js diff --git a/kallithea/public/js/mode/cobol/index.html b/kallithea/public/codemirror/mode/cobol/index.html rename from kallithea/public/js/mode/cobol/index.html rename to kallithea/public/codemirror/mode/cobol/index.html diff --git a/kallithea/public/js/mode/coffeescript/LICENSE b/kallithea/public/codemirror/mode/coffeescript/LICENSE rename from kallithea/public/js/mode/coffeescript/LICENSE rename to kallithea/public/codemirror/mode/coffeescript/LICENSE diff --git a/kallithea/public/js/mode/coffeescript/coffeescript.js b/kallithea/public/codemirror/mode/coffeescript/coffeescript.js rename from kallithea/public/js/mode/coffeescript/coffeescript.js rename to kallithea/public/codemirror/mode/coffeescript/coffeescript.js diff --git a/kallithea/public/js/mode/coffeescript/index.html b/kallithea/public/codemirror/mode/coffeescript/index.html rename from kallithea/public/js/mode/coffeescript/index.html rename to kallithea/public/codemirror/mode/coffeescript/index.html diff --git a/kallithea/public/js/mode/commonlisp/commonlisp.js b/kallithea/public/codemirror/mode/commonlisp/commonlisp.js rename from kallithea/public/js/mode/commonlisp/commonlisp.js rename to kallithea/public/codemirror/mode/commonlisp/commonlisp.js diff --git a/kallithea/public/js/mode/commonlisp/index.html b/kallithea/public/codemirror/mode/commonlisp/index.html rename from kallithea/public/js/mode/commonlisp/index.html rename to kallithea/public/codemirror/mode/commonlisp/index.html diff --git a/kallithea/public/js/mode/css/css.js b/kallithea/public/codemirror/mode/css/css.js rename from kallithea/public/js/mode/css/css.js rename to kallithea/public/codemirror/mode/css/css.js diff --git a/kallithea/public/js/mode/css/index.html b/kallithea/public/codemirror/mode/css/index.html rename from kallithea/public/js/mode/css/index.html rename to kallithea/public/codemirror/mode/css/index.html diff --git a/kallithea/public/js/mode/css/scss.html b/kallithea/public/codemirror/mode/css/scss.html rename from kallithea/public/js/mode/css/scss.html rename to kallithea/public/codemirror/mode/css/scss.html diff --git a/kallithea/public/js/mode/css/scss_test.js b/kallithea/public/codemirror/mode/css/scss_test.js rename from kallithea/public/js/mode/css/scss_test.js rename to kallithea/public/codemirror/mode/css/scss_test.js diff --git a/kallithea/public/js/mode/css/test.js b/kallithea/public/codemirror/mode/css/test.js rename from kallithea/public/js/mode/css/test.js rename to kallithea/public/codemirror/mode/css/test.js diff --git a/kallithea/public/js/mode/d/d.js b/kallithea/public/codemirror/mode/d/d.js rename from kallithea/public/js/mode/d/d.js rename to kallithea/public/codemirror/mode/d/d.js diff --git a/kallithea/public/js/mode/d/index.html b/kallithea/public/codemirror/mode/d/index.html rename from kallithea/public/js/mode/d/index.html rename to kallithea/public/codemirror/mode/d/index.html diff --git a/kallithea/public/js/mode/diff/diff.js b/kallithea/public/codemirror/mode/diff/diff.js rename from kallithea/public/js/mode/diff/diff.js rename to kallithea/public/codemirror/mode/diff/diff.js diff --git a/kallithea/public/js/mode/diff/index.html b/kallithea/public/codemirror/mode/diff/index.html rename from kallithea/public/js/mode/diff/index.html rename to kallithea/public/codemirror/mode/diff/index.html diff --git a/kallithea/public/js/mode/ecl/ecl.js b/kallithea/public/codemirror/mode/ecl/ecl.js rename from kallithea/public/js/mode/ecl/ecl.js rename to kallithea/public/codemirror/mode/ecl/ecl.js diff --git a/kallithea/public/js/mode/ecl/index.html b/kallithea/public/codemirror/mode/ecl/index.html rename from kallithea/public/js/mode/ecl/index.html rename to kallithea/public/codemirror/mode/ecl/index.html diff --git a/kallithea/public/js/mode/erlang/erlang.js b/kallithea/public/codemirror/mode/erlang/erlang.js rename from kallithea/public/js/mode/erlang/erlang.js rename to kallithea/public/codemirror/mode/erlang/erlang.js diff --git a/kallithea/public/js/mode/erlang/index.html b/kallithea/public/codemirror/mode/erlang/index.html rename from kallithea/public/js/mode/erlang/index.html rename to kallithea/public/codemirror/mode/erlang/index.html diff --git a/kallithea/public/js/mode/gas/gas.js b/kallithea/public/codemirror/mode/gas/gas.js rename from kallithea/public/js/mode/gas/gas.js rename to kallithea/public/codemirror/mode/gas/gas.js diff --git a/kallithea/public/js/mode/gas/index.html b/kallithea/public/codemirror/mode/gas/index.html rename from kallithea/public/js/mode/gas/index.html rename to kallithea/public/codemirror/mode/gas/index.html diff --git a/kallithea/public/js/mode/gfm/gfm.js b/kallithea/public/codemirror/mode/gfm/gfm.js rename from kallithea/public/js/mode/gfm/gfm.js rename to kallithea/public/codemirror/mode/gfm/gfm.js diff --git a/kallithea/public/js/mode/gfm/index.html b/kallithea/public/codemirror/mode/gfm/index.html rename from kallithea/public/js/mode/gfm/index.html rename to kallithea/public/codemirror/mode/gfm/index.html diff --git a/kallithea/public/js/mode/gfm/test.js b/kallithea/public/codemirror/mode/gfm/test.js rename from kallithea/public/js/mode/gfm/test.js rename to kallithea/public/codemirror/mode/gfm/test.js diff --git a/kallithea/public/js/mode/go/go.js b/kallithea/public/codemirror/mode/go/go.js rename from kallithea/public/js/mode/go/go.js rename to kallithea/public/codemirror/mode/go/go.js diff --git a/kallithea/public/js/mode/go/index.html b/kallithea/public/codemirror/mode/go/index.html rename from kallithea/public/js/mode/go/index.html rename to kallithea/public/codemirror/mode/go/index.html diff --git a/kallithea/public/js/mode/groovy/groovy.js b/kallithea/public/codemirror/mode/groovy/groovy.js rename from kallithea/public/js/mode/groovy/groovy.js rename to kallithea/public/codemirror/mode/groovy/groovy.js diff --git a/kallithea/public/js/mode/groovy/index.html b/kallithea/public/codemirror/mode/groovy/index.html rename from kallithea/public/js/mode/groovy/index.html rename to kallithea/public/codemirror/mode/groovy/index.html diff --git a/kallithea/public/js/mode/haml/haml.js b/kallithea/public/codemirror/mode/haml/haml.js rename from kallithea/public/js/mode/haml/haml.js rename to kallithea/public/codemirror/mode/haml/haml.js diff --git a/kallithea/public/js/mode/haml/index.html b/kallithea/public/codemirror/mode/haml/index.html rename from kallithea/public/js/mode/haml/index.html rename to kallithea/public/codemirror/mode/haml/index.html diff --git a/kallithea/public/js/mode/haml/test.js b/kallithea/public/codemirror/mode/haml/test.js rename from kallithea/public/js/mode/haml/test.js rename to kallithea/public/codemirror/mode/haml/test.js diff --git a/kallithea/public/js/mode/haskell/haskell.js b/kallithea/public/codemirror/mode/haskell/haskell.js rename from kallithea/public/js/mode/haskell/haskell.js rename to kallithea/public/codemirror/mode/haskell/haskell.js diff --git a/kallithea/public/js/mode/haskell/index.html b/kallithea/public/codemirror/mode/haskell/index.html rename from kallithea/public/js/mode/haskell/index.html rename to kallithea/public/codemirror/mode/haskell/index.html diff --git a/kallithea/public/js/mode/haxe/haxe.js b/kallithea/public/codemirror/mode/haxe/haxe.js rename from kallithea/public/js/mode/haxe/haxe.js rename to kallithea/public/codemirror/mode/haxe/haxe.js diff --git a/kallithea/public/js/mode/haxe/index.html b/kallithea/public/codemirror/mode/haxe/index.html rename from kallithea/public/js/mode/haxe/index.html rename to kallithea/public/codemirror/mode/haxe/index.html diff --git a/kallithea/public/js/mode/htmlembedded/htmlembedded.js b/kallithea/public/codemirror/mode/htmlembedded/htmlembedded.js rename from kallithea/public/js/mode/htmlembedded/htmlembedded.js rename to kallithea/public/codemirror/mode/htmlembedded/htmlembedded.js diff --git a/kallithea/public/js/mode/htmlembedded/index.html b/kallithea/public/codemirror/mode/htmlembedded/index.html rename from kallithea/public/js/mode/htmlembedded/index.html rename to kallithea/public/codemirror/mode/htmlembedded/index.html diff --git a/kallithea/public/js/mode/htmlmixed/htmlmixed.js b/kallithea/public/codemirror/mode/htmlmixed/htmlmixed.js rename from kallithea/public/js/mode/htmlmixed/htmlmixed.js rename to kallithea/public/codemirror/mode/htmlmixed/htmlmixed.js diff --git a/kallithea/public/js/mode/htmlmixed/index.html b/kallithea/public/codemirror/mode/htmlmixed/index.html rename from kallithea/public/js/mode/htmlmixed/index.html rename to kallithea/public/codemirror/mode/htmlmixed/index.html diff --git a/kallithea/public/js/mode/http/http.js b/kallithea/public/codemirror/mode/http/http.js rename from kallithea/public/js/mode/http/http.js rename to kallithea/public/codemirror/mode/http/http.js diff --git a/kallithea/public/js/mode/http/index.html b/kallithea/public/codemirror/mode/http/index.html rename from kallithea/public/js/mode/http/index.html rename to kallithea/public/codemirror/mode/http/index.html diff --git a/kallithea/public/js/mode/jade/index.html b/kallithea/public/codemirror/mode/jade/index.html rename from kallithea/public/js/mode/jade/index.html rename to kallithea/public/codemirror/mode/jade/index.html diff --git a/kallithea/public/js/mode/jade/jade.js b/kallithea/public/codemirror/mode/jade/jade.js rename from kallithea/public/js/mode/jade/jade.js rename to kallithea/public/codemirror/mode/jade/jade.js diff --git a/kallithea/public/js/mode/javascript/index.html b/kallithea/public/codemirror/mode/javascript/index.html rename from kallithea/public/js/mode/javascript/index.html rename to kallithea/public/codemirror/mode/javascript/index.html diff --git a/kallithea/public/js/mode/javascript/javascript.js b/kallithea/public/codemirror/mode/javascript/javascript.js rename from kallithea/public/js/mode/javascript/javascript.js rename to kallithea/public/codemirror/mode/javascript/javascript.js diff --git a/kallithea/public/js/mode/javascript/test.js b/kallithea/public/codemirror/mode/javascript/test.js rename from kallithea/public/js/mode/javascript/test.js rename to kallithea/public/codemirror/mode/javascript/test.js diff --git a/kallithea/public/js/mode/javascript/typescript.html b/kallithea/public/codemirror/mode/javascript/typescript.html rename from kallithea/public/js/mode/javascript/typescript.html rename to kallithea/public/codemirror/mode/javascript/typescript.html diff --git a/kallithea/public/js/mode/jinja2/index.html b/kallithea/public/codemirror/mode/jinja2/index.html rename from kallithea/public/js/mode/jinja2/index.html rename to kallithea/public/codemirror/mode/jinja2/index.html diff --git a/kallithea/public/js/mode/jinja2/jinja2.js b/kallithea/public/codemirror/mode/jinja2/jinja2.js rename from kallithea/public/js/mode/jinja2/jinja2.js rename to kallithea/public/codemirror/mode/jinja2/jinja2.js diff --git a/kallithea/public/js/mode/less/index.html b/kallithea/public/codemirror/mode/less/index.html rename from kallithea/public/js/mode/less/index.html rename to kallithea/public/codemirror/mode/less/index.html diff --git a/kallithea/public/js/mode/less/less.js b/kallithea/public/codemirror/mode/less/less.js rename from kallithea/public/js/mode/less/less.js rename to kallithea/public/codemirror/mode/less/less.js diff --git a/kallithea/public/js/mode/livescript/LICENSE b/kallithea/public/codemirror/mode/livescript/LICENSE rename from kallithea/public/js/mode/livescript/LICENSE rename to kallithea/public/codemirror/mode/livescript/LICENSE diff --git a/kallithea/public/js/mode/livescript/index.html b/kallithea/public/codemirror/mode/livescript/index.html rename from kallithea/public/js/mode/livescript/index.html rename to kallithea/public/codemirror/mode/livescript/index.html diff --git a/kallithea/public/js/mode/livescript/livescript.js b/kallithea/public/codemirror/mode/livescript/livescript.js rename from kallithea/public/js/mode/livescript/livescript.js rename to kallithea/public/codemirror/mode/livescript/livescript.js diff --git a/kallithea/public/js/mode/livescript/livescript.ls b/kallithea/public/codemirror/mode/livescript/livescript.ls rename from kallithea/public/js/mode/livescript/livescript.ls rename to kallithea/public/codemirror/mode/livescript/livescript.ls diff --git a/kallithea/public/js/mode/lua/index.html b/kallithea/public/codemirror/mode/lua/index.html rename from kallithea/public/js/mode/lua/index.html rename to kallithea/public/codemirror/mode/lua/index.html diff --git a/kallithea/public/js/mode/lua/lua.js b/kallithea/public/codemirror/mode/lua/lua.js rename from kallithea/public/js/mode/lua/lua.js rename to kallithea/public/codemirror/mode/lua/lua.js diff --git a/kallithea/public/js/mode/markdown/index.html b/kallithea/public/codemirror/mode/markdown/index.html rename from kallithea/public/js/mode/markdown/index.html rename to kallithea/public/codemirror/mode/markdown/index.html diff --git a/kallithea/public/js/mode/markdown/markdown.js b/kallithea/public/codemirror/mode/markdown/markdown.js rename from kallithea/public/js/mode/markdown/markdown.js rename to kallithea/public/codemirror/mode/markdown/markdown.js diff --git a/kallithea/public/js/mode/markdown/test.js b/kallithea/public/codemirror/mode/markdown/test.js rename from kallithea/public/js/mode/markdown/test.js rename to kallithea/public/codemirror/mode/markdown/test.js diff --git a/kallithea/public/js/mode/meta.js b/kallithea/public/codemirror/mode/meta.js rename from kallithea/public/js/mode/meta.js rename to kallithea/public/codemirror/mode/meta.js diff --git a/kallithea/public/js/mode/mirc/index.html b/kallithea/public/codemirror/mode/mirc/index.html rename from kallithea/public/js/mode/mirc/index.html rename to kallithea/public/codemirror/mode/mirc/index.html diff --git a/kallithea/public/js/mode/mirc/mirc.js b/kallithea/public/codemirror/mode/mirc/mirc.js rename from kallithea/public/js/mode/mirc/mirc.js rename to kallithea/public/codemirror/mode/mirc/mirc.js diff --git a/kallithea/public/js/mode/nginx/index.html b/kallithea/public/codemirror/mode/nginx/index.html rename from kallithea/public/js/mode/nginx/index.html rename to kallithea/public/codemirror/mode/nginx/index.html diff --git a/kallithea/public/js/mode/nginx/nginx.js b/kallithea/public/codemirror/mode/nginx/nginx.js rename from kallithea/public/js/mode/nginx/nginx.js rename to kallithea/public/codemirror/mode/nginx/nginx.js diff --git a/kallithea/public/js/mode/ntriples/index.html b/kallithea/public/codemirror/mode/ntriples/index.html rename from kallithea/public/js/mode/ntriples/index.html rename to kallithea/public/codemirror/mode/ntriples/index.html diff --git a/kallithea/public/js/mode/ntriples/ntriples.js b/kallithea/public/codemirror/mode/ntriples/ntriples.js rename from kallithea/public/js/mode/ntriples/ntriples.js rename to kallithea/public/codemirror/mode/ntriples/ntriples.js diff --git a/kallithea/public/js/mode/ocaml/index.html b/kallithea/public/codemirror/mode/ocaml/index.html rename from kallithea/public/js/mode/ocaml/index.html rename to kallithea/public/codemirror/mode/ocaml/index.html diff --git a/kallithea/public/js/mode/ocaml/ocaml.js b/kallithea/public/codemirror/mode/ocaml/ocaml.js rename from kallithea/public/js/mode/ocaml/ocaml.js rename to kallithea/public/codemirror/mode/ocaml/ocaml.js diff --git a/kallithea/public/js/mode/pascal/LICENSE b/kallithea/public/codemirror/mode/pascal/LICENSE rename from kallithea/public/js/mode/pascal/LICENSE rename to kallithea/public/codemirror/mode/pascal/LICENSE diff --git a/kallithea/public/js/mode/pascal/index.html b/kallithea/public/codemirror/mode/pascal/index.html rename from kallithea/public/js/mode/pascal/index.html rename to kallithea/public/codemirror/mode/pascal/index.html diff --git a/kallithea/public/js/mode/pascal/pascal.js b/kallithea/public/codemirror/mode/pascal/pascal.js rename from kallithea/public/js/mode/pascal/pascal.js rename to kallithea/public/codemirror/mode/pascal/pascal.js diff --git a/kallithea/public/js/mode/perl/LICENSE b/kallithea/public/codemirror/mode/perl/LICENSE rename from kallithea/public/js/mode/perl/LICENSE rename to kallithea/public/codemirror/mode/perl/LICENSE diff --git a/kallithea/public/js/mode/perl/index.html b/kallithea/public/codemirror/mode/perl/index.html rename from kallithea/public/js/mode/perl/index.html rename to kallithea/public/codemirror/mode/perl/index.html diff --git a/kallithea/public/js/mode/perl/perl.js b/kallithea/public/codemirror/mode/perl/perl.js rename from kallithea/public/js/mode/perl/perl.js rename to kallithea/public/codemirror/mode/perl/perl.js diff --git a/kallithea/public/js/mode/php/index.html b/kallithea/public/codemirror/mode/php/index.html rename from kallithea/public/js/mode/php/index.html rename to kallithea/public/codemirror/mode/php/index.html diff --git a/kallithea/public/js/mode/php/php.js b/kallithea/public/codemirror/mode/php/php.js rename from kallithea/public/js/mode/php/php.js rename to kallithea/public/codemirror/mode/php/php.js diff --git a/kallithea/public/js/mode/pig/index.html b/kallithea/public/codemirror/mode/pig/index.html rename from kallithea/public/js/mode/pig/index.html rename to kallithea/public/codemirror/mode/pig/index.html diff --git a/kallithea/public/js/mode/pig/pig.js b/kallithea/public/codemirror/mode/pig/pig.js rename from kallithea/public/js/mode/pig/pig.js rename to kallithea/public/codemirror/mode/pig/pig.js diff --git a/kallithea/public/js/mode/properties/index.html b/kallithea/public/codemirror/mode/properties/index.html rename from kallithea/public/js/mode/properties/index.html rename to kallithea/public/codemirror/mode/properties/index.html diff --git a/kallithea/public/js/mode/properties/properties.js b/kallithea/public/codemirror/mode/properties/properties.js rename from kallithea/public/js/mode/properties/properties.js rename to kallithea/public/codemirror/mode/properties/properties.js diff --git a/kallithea/public/js/mode/python/LICENSE.txt b/kallithea/public/codemirror/mode/python/LICENSE.txt rename from kallithea/public/js/mode/python/LICENSE.txt rename to kallithea/public/codemirror/mode/python/LICENSE.txt diff --git a/kallithea/public/js/mode/python/index.html b/kallithea/public/codemirror/mode/python/index.html rename from kallithea/public/js/mode/python/index.html rename to kallithea/public/codemirror/mode/python/index.html diff --git a/kallithea/public/js/mode/python/python.js b/kallithea/public/codemirror/mode/python/python.js rename from kallithea/public/js/mode/python/python.js rename to kallithea/public/codemirror/mode/python/python.js diff --git a/kallithea/public/js/mode/q/index.html b/kallithea/public/codemirror/mode/q/index.html rename from kallithea/public/js/mode/q/index.html rename to kallithea/public/codemirror/mode/q/index.html diff --git a/kallithea/public/js/mode/q/q.js b/kallithea/public/codemirror/mode/q/q.js rename from kallithea/public/js/mode/q/q.js rename to kallithea/public/codemirror/mode/q/q.js diff --git a/kallithea/public/js/mode/r/LICENSE b/kallithea/public/codemirror/mode/r/LICENSE rename from kallithea/public/js/mode/r/LICENSE rename to kallithea/public/codemirror/mode/r/LICENSE diff --git a/kallithea/public/js/mode/r/index.html b/kallithea/public/codemirror/mode/r/index.html rename from kallithea/public/js/mode/r/index.html rename to kallithea/public/codemirror/mode/r/index.html diff --git a/kallithea/public/js/mode/r/r.js b/kallithea/public/codemirror/mode/r/r.js rename from kallithea/public/js/mode/r/r.js rename to kallithea/public/codemirror/mode/r/r.js diff --git a/kallithea/public/js/mode/rpm/changes/changes.js b/kallithea/public/codemirror/mode/rpm/changes/changes.js rename from kallithea/public/js/mode/rpm/changes/changes.js rename to kallithea/public/codemirror/mode/rpm/changes/changes.js diff --git a/kallithea/public/js/mode/rpm/changes/index.html b/kallithea/public/codemirror/mode/rpm/changes/index.html rename from kallithea/public/js/mode/rpm/changes/index.html rename to kallithea/public/codemirror/mode/rpm/changes/index.html diff --git a/kallithea/public/js/mode/rpm/spec/index.html b/kallithea/public/codemirror/mode/rpm/spec/index.html rename from kallithea/public/js/mode/rpm/spec/index.html rename to kallithea/public/codemirror/mode/rpm/spec/index.html diff --git a/kallithea/public/js/mode/rpm/spec/spec.css b/kallithea/public/codemirror/mode/rpm/spec/spec.css rename from kallithea/public/js/mode/rpm/spec/spec.css rename to kallithea/public/codemirror/mode/rpm/spec/spec.css diff --git a/kallithea/public/js/mode/rpm/spec/spec.js b/kallithea/public/codemirror/mode/rpm/spec/spec.js rename from kallithea/public/js/mode/rpm/spec/spec.js rename to kallithea/public/codemirror/mode/rpm/spec/spec.js diff --git a/kallithea/public/js/mode/rst/LICENSE.txt b/kallithea/public/codemirror/mode/rst/LICENSE.txt rename from kallithea/public/js/mode/rst/LICENSE.txt rename to kallithea/public/codemirror/mode/rst/LICENSE.txt diff --git a/kallithea/public/js/mode/rst/index.html b/kallithea/public/codemirror/mode/rst/index.html rename from kallithea/public/js/mode/rst/index.html rename to kallithea/public/codemirror/mode/rst/index.html diff --git a/kallithea/public/js/mode/rst/rst.js b/kallithea/public/codemirror/mode/rst/rst.js rename from kallithea/public/js/mode/rst/rst.js rename to kallithea/public/codemirror/mode/rst/rst.js diff --git a/kallithea/public/js/mode/ruby/LICENSE b/kallithea/public/codemirror/mode/ruby/LICENSE rename from kallithea/public/js/mode/ruby/LICENSE rename to kallithea/public/codemirror/mode/ruby/LICENSE diff --git a/kallithea/public/js/mode/ruby/index.html b/kallithea/public/codemirror/mode/ruby/index.html rename from kallithea/public/js/mode/ruby/index.html rename to kallithea/public/codemirror/mode/ruby/index.html diff --git a/kallithea/public/js/mode/ruby/ruby.js b/kallithea/public/codemirror/mode/ruby/ruby.js rename from kallithea/public/js/mode/ruby/ruby.js rename to kallithea/public/codemirror/mode/ruby/ruby.js diff --git a/kallithea/public/js/mode/rust/index.html b/kallithea/public/codemirror/mode/rust/index.html rename from kallithea/public/js/mode/rust/index.html rename to kallithea/public/codemirror/mode/rust/index.html diff --git a/kallithea/public/js/mode/rust/rust.js b/kallithea/public/codemirror/mode/rust/rust.js rename from kallithea/public/js/mode/rust/rust.js rename to kallithea/public/codemirror/mode/rust/rust.js diff --git a/kallithea/public/js/mode/sass/index.html b/kallithea/public/codemirror/mode/sass/index.html rename from kallithea/public/js/mode/sass/index.html rename to kallithea/public/codemirror/mode/sass/index.html diff --git a/kallithea/public/js/mode/sass/sass.js b/kallithea/public/codemirror/mode/sass/sass.js rename from kallithea/public/js/mode/sass/sass.js rename to kallithea/public/codemirror/mode/sass/sass.js diff --git a/kallithea/public/js/mode/scheme/index.html b/kallithea/public/codemirror/mode/scheme/index.html rename from kallithea/public/js/mode/scheme/index.html rename to kallithea/public/codemirror/mode/scheme/index.html diff --git a/kallithea/public/js/mode/scheme/scheme.js b/kallithea/public/codemirror/mode/scheme/scheme.js rename from kallithea/public/js/mode/scheme/scheme.js rename to kallithea/public/codemirror/mode/scheme/scheme.js diff --git a/kallithea/public/js/mode/shell/index.html b/kallithea/public/codemirror/mode/shell/index.html rename from kallithea/public/js/mode/shell/index.html rename to kallithea/public/codemirror/mode/shell/index.html diff --git a/kallithea/public/js/mode/shell/shell.js b/kallithea/public/codemirror/mode/shell/shell.js rename from kallithea/public/js/mode/shell/shell.js rename to kallithea/public/codemirror/mode/shell/shell.js diff --git a/kallithea/public/js/mode/sieve/LICENSE b/kallithea/public/codemirror/mode/sieve/LICENSE rename from kallithea/public/js/mode/sieve/LICENSE rename to kallithea/public/codemirror/mode/sieve/LICENSE diff --git a/kallithea/public/js/mode/sieve/index.html b/kallithea/public/codemirror/mode/sieve/index.html rename from kallithea/public/js/mode/sieve/index.html rename to kallithea/public/codemirror/mode/sieve/index.html diff --git a/kallithea/public/js/mode/sieve/sieve.js b/kallithea/public/codemirror/mode/sieve/sieve.js rename from kallithea/public/js/mode/sieve/sieve.js rename to kallithea/public/codemirror/mode/sieve/sieve.js diff --git a/kallithea/public/js/mode/smalltalk/index.html b/kallithea/public/codemirror/mode/smalltalk/index.html rename from kallithea/public/js/mode/smalltalk/index.html rename to kallithea/public/codemirror/mode/smalltalk/index.html diff --git a/kallithea/public/js/mode/smalltalk/smalltalk.js b/kallithea/public/codemirror/mode/smalltalk/smalltalk.js rename from kallithea/public/js/mode/smalltalk/smalltalk.js rename to kallithea/public/codemirror/mode/smalltalk/smalltalk.js diff --git a/kallithea/public/js/mode/smarty/index.html b/kallithea/public/codemirror/mode/smarty/index.html rename from kallithea/public/js/mode/smarty/index.html rename to kallithea/public/codemirror/mode/smarty/index.html diff --git a/kallithea/public/js/mode/smarty/smarty.js b/kallithea/public/codemirror/mode/smarty/smarty.js rename from kallithea/public/js/mode/smarty/smarty.js rename to kallithea/public/codemirror/mode/smarty/smarty.js diff --git a/kallithea/public/js/mode/smartymixed/index.html b/kallithea/public/codemirror/mode/smartymixed/index.html rename from kallithea/public/js/mode/smartymixed/index.html rename to kallithea/public/codemirror/mode/smartymixed/index.html diff --git a/kallithea/public/js/mode/smartymixed/smartymixed.js b/kallithea/public/codemirror/mode/smartymixed/smartymixed.js rename from kallithea/public/js/mode/smartymixed/smartymixed.js rename to kallithea/public/codemirror/mode/smartymixed/smartymixed.js diff --git a/kallithea/public/js/mode/sparql/index.html b/kallithea/public/codemirror/mode/sparql/index.html rename from kallithea/public/js/mode/sparql/index.html rename to kallithea/public/codemirror/mode/sparql/index.html diff --git a/kallithea/public/js/mode/sparql/sparql.js b/kallithea/public/codemirror/mode/sparql/sparql.js rename from kallithea/public/js/mode/sparql/sparql.js rename to kallithea/public/codemirror/mode/sparql/sparql.js diff --git a/kallithea/public/js/mode/sql/index.html b/kallithea/public/codemirror/mode/sql/index.html rename from kallithea/public/js/mode/sql/index.html rename to kallithea/public/codemirror/mode/sql/index.html diff --git a/kallithea/public/js/mode/sql/sql.js b/kallithea/public/codemirror/mode/sql/sql.js rename from kallithea/public/js/mode/sql/sql.js rename to kallithea/public/codemirror/mode/sql/sql.js diff --git a/kallithea/public/js/mode/stex/index.html b/kallithea/public/codemirror/mode/stex/index.html rename from kallithea/public/js/mode/stex/index.html rename to kallithea/public/codemirror/mode/stex/index.html diff --git a/kallithea/public/js/mode/stex/stex.js b/kallithea/public/codemirror/mode/stex/stex.js rename from kallithea/public/js/mode/stex/stex.js rename to kallithea/public/codemirror/mode/stex/stex.js diff --git a/kallithea/public/js/mode/stex/test.js b/kallithea/public/codemirror/mode/stex/test.js rename from kallithea/public/js/mode/stex/test.js rename to kallithea/public/codemirror/mode/stex/test.js diff --git a/kallithea/public/js/mode/tcl/index.html b/kallithea/public/codemirror/mode/tcl/index.html rename from kallithea/public/js/mode/tcl/index.html rename to kallithea/public/codemirror/mode/tcl/index.html diff --git a/kallithea/public/js/mode/tcl/tcl.js b/kallithea/public/codemirror/mode/tcl/tcl.js rename from kallithea/public/js/mode/tcl/tcl.js rename to kallithea/public/codemirror/mode/tcl/tcl.js diff --git a/kallithea/public/js/mode/tiddlywiki/index.html b/kallithea/public/codemirror/mode/tiddlywiki/index.html rename from kallithea/public/js/mode/tiddlywiki/index.html rename to kallithea/public/codemirror/mode/tiddlywiki/index.html diff --git a/kallithea/public/js/mode/tiddlywiki/tiddlywiki.css b/kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.css rename from kallithea/public/js/mode/tiddlywiki/tiddlywiki.css rename to kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.css diff --git a/kallithea/public/js/mode/tiddlywiki/tiddlywiki.js b/kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.js rename from kallithea/public/js/mode/tiddlywiki/tiddlywiki.js rename to kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.js diff --git a/kallithea/public/js/mode/tiki/index.html b/kallithea/public/codemirror/mode/tiki/index.html rename from kallithea/public/js/mode/tiki/index.html rename to kallithea/public/codemirror/mode/tiki/index.html diff --git a/kallithea/public/js/mode/tiki/tiki.css b/kallithea/public/codemirror/mode/tiki/tiki.css rename from kallithea/public/js/mode/tiki/tiki.css rename to kallithea/public/codemirror/mode/tiki/tiki.css diff --git a/kallithea/public/js/mode/tiki/tiki.js b/kallithea/public/codemirror/mode/tiki/tiki.js rename from kallithea/public/js/mode/tiki/tiki.js rename to kallithea/public/codemirror/mode/tiki/tiki.js diff --git a/kallithea/public/js/mode/turtle/index.html b/kallithea/public/codemirror/mode/turtle/index.html rename from kallithea/public/js/mode/turtle/index.html rename to kallithea/public/codemirror/mode/turtle/index.html diff --git a/kallithea/public/js/mode/turtle/turtle.js b/kallithea/public/codemirror/mode/turtle/turtle.js rename from kallithea/public/js/mode/turtle/turtle.js rename to kallithea/public/codemirror/mode/turtle/turtle.js diff --git a/kallithea/public/js/mode/vb/LICENSE.txt b/kallithea/public/codemirror/mode/vb/LICENSE.txt rename from kallithea/public/js/mode/vb/LICENSE.txt rename to kallithea/public/codemirror/mode/vb/LICENSE.txt diff --git a/kallithea/public/js/mode/vb/index.html b/kallithea/public/codemirror/mode/vb/index.html rename from kallithea/public/js/mode/vb/index.html rename to kallithea/public/codemirror/mode/vb/index.html diff --git a/kallithea/public/js/mode/vb/vb.js b/kallithea/public/codemirror/mode/vb/vb.js rename from kallithea/public/js/mode/vb/vb.js rename to kallithea/public/codemirror/mode/vb/vb.js diff --git a/kallithea/public/js/mode/vbscript/index.html b/kallithea/public/codemirror/mode/vbscript/index.html rename from kallithea/public/js/mode/vbscript/index.html rename to kallithea/public/codemirror/mode/vbscript/index.html diff --git a/kallithea/public/js/mode/vbscript/vbscript.js b/kallithea/public/codemirror/mode/vbscript/vbscript.js rename from kallithea/public/js/mode/vbscript/vbscript.js rename to kallithea/public/codemirror/mode/vbscript/vbscript.js diff --git a/kallithea/public/js/mode/velocity/index.html b/kallithea/public/codemirror/mode/velocity/index.html rename from kallithea/public/js/mode/velocity/index.html rename to kallithea/public/codemirror/mode/velocity/index.html diff --git a/kallithea/public/js/mode/velocity/velocity.js b/kallithea/public/codemirror/mode/velocity/velocity.js rename from kallithea/public/js/mode/velocity/velocity.js rename to kallithea/public/codemirror/mode/velocity/velocity.js diff --git a/kallithea/public/js/mode/verilog/index.html b/kallithea/public/codemirror/mode/verilog/index.html rename from kallithea/public/js/mode/verilog/index.html rename to kallithea/public/codemirror/mode/verilog/index.html diff --git a/kallithea/public/js/mode/verilog/verilog.js b/kallithea/public/codemirror/mode/verilog/verilog.js rename from kallithea/public/js/mode/verilog/verilog.js rename to kallithea/public/codemirror/mode/verilog/verilog.js diff --git a/kallithea/public/js/mode/xml/index.html b/kallithea/public/codemirror/mode/xml/index.html rename from kallithea/public/js/mode/xml/index.html rename to kallithea/public/codemirror/mode/xml/index.html diff --git a/kallithea/public/js/mode/xml/xml.js b/kallithea/public/codemirror/mode/xml/xml.js rename from kallithea/public/js/mode/xml/xml.js rename to kallithea/public/codemirror/mode/xml/xml.js diff --git a/kallithea/public/js/mode/xquery/LICENSE b/kallithea/public/codemirror/mode/xquery/LICENSE rename from kallithea/public/js/mode/xquery/LICENSE rename to kallithea/public/codemirror/mode/xquery/LICENSE diff --git a/kallithea/public/js/mode/xquery/index.html b/kallithea/public/codemirror/mode/xquery/index.html rename from kallithea/public/js/mode/xquery/index.html rename to kallithea/public/codemirror/mode/xquery/index.html diff --git a/kallithea/public/js/mode/xquery/test.js b/kallithea/public/codemirror/mode/xquery/test.js rename from kallithea/public/js/mode/xquery/test.js rename to kallithea/public/codemirror/mode/xquery/test.js diff --git a/kallithea/public/js/mode/xquery/xquery.js b/kallithea/public/codemirror/mode/xquery/xquery.js rename from kallithea/public/js/mode/xquery/xquery.js rename to kallithea/public/codemirror/mode/xquery/xquery.js diff --git a/kallithea/public/js/mode/yaml/index.html b/kallithea/public/codemirror/mode/yaml/index.html rename from kallithea/public/js/mode/yaml/index.html rename to kallithea/public/codemirror/mode/yaml/index.html diff --git a/kallithea/public/js/mode/yaml/yaml.js b/kallithea/public/codemirror/mode/yaml/yaml.js rename from kallithea/public/js/mode/yaml/yaml.js rename to kallithea/public/codemirror/mode/yaml/yaml.js diff --git a/kallithea/public/js/mode/z80/index.html b/kallithea/public/codemirror/mode/z80/index.html rename from kallithea/public/js/mode/z80/index.html rename to kallithea/public/codemirror/mode/z80/index.html diff --git a/kallithea/public/js/mode/z80/z80.js b/kallithea/public/codemirror/mode/z80/z80.js rename from kallithea/public/js/mode/z80/z80.js rename to kallithea/public/codemirror/mode/z80/z80.js diff --git a/kallithea/public/js/codemirror_loadmode.js b/kallithea/public/js/codemirror_loadmode.js --- a/kallithea/public/js/codemirror_loadmode.js +++ b/kallithea/public/js/codemirror_loadmode.js @@ -1,4 +1,5 @@ (function() { + // FIXME: if this default value ever is used, it will probably be wrong if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js"; var loading = {}; diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html --- a/kallithea/templates/admin/gists/edit.html +++ b/kallithea/templates/admin/gists/edit.html @@ -9,13 +9,13 @@ <%def name="js_extra()"> - + - + <%def name="css_extra()"> - + <%def name="breadcrumbs_links()"> @@ -89,7 +89,7 @@ ## dynamic edit box. + - + <%def name="css_extra()"> - + <%def name="breadcrumbs_links()"> @@ -64,7 +64,7 @@ ${h.end_form()} + <%def name="css_extra()"> - + diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html --- a/kallithea/templates/files/files_add.html +++ b/kallithea/templates/files/files_add.html @@ -8,13 +8,13 @@ <%def name="js_extra()"> - + - + <%def name="css_extra()"> - + <%def name="page_nav()"> @@ -72,7 +72,7 @@ ${self.repo_context_bar('files')} + - + <%def name="css_extra()"> - + <%def name="page_nav()"> diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html --- a/kallithea/templates/files/files_edit.html +++ b/kallithea/templates/files/files_edit.html @@ -8,13 +8,13 @@ <%def name="js_extra()"> - + - + <%def name="css_extra()"> - + <%def name="page_nav()"> @@ -80,7 +80,7 @@ ${self.repo_context_bar('files')} $(document).ready(function(){ var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}"; var myCodeMirror = initCodeMirror('editor',reset_url); - CodeMirror.modeURL = "${h.url('/js/mode/%N/%N.js')}"; + CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}"; //inject new modes, based on codeMirrors modeInfo object var modes_select = $('#set_mode');