lines-engine 0.6.2 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data.tar.gz.sig +0 -0
- data/.gitignore +1 -0
- data/CHANGELOG.md +10 -3
- data/Gemfile +1 -0
- data/Gemfile.lock +10 -6
- data/app/assets/images/favicon.ico +0 -0
- data/app/assets/images/gplus.svg +17 -0
- data/app/assets/javascripts/lines/admin/admin.js +299 -0
- data/app/assets/javascripts/lines/{autosize.min.js → admin/autosize.min.js} +0 -0
- data/app/assets/javascripts/lines/admin/navbar.js +51 -0
- data/app/assets/javascripts/lines/{pictures.js.coffee → admin/pictures.js.coffee} +2 -1
- data/app/assets/javascripts/lines/application.js +3 -0
- data/app/assets/javascripts/lines/articles.js.coffee +1 -0
- data/app/assets/javascripts/lines/viewer.js.coffee +3 -0
- data/app/assets/stylesheets/lines/admin/admin.scss +609 -0
- data/app/assets/stylesheets/lines/admin/variables_and_mixins.scss +36 -0
- data/app/assets/stylesheets/lines/application.scss +2 -13
- data/app/assets/stylesheets/lines/article.scss +165 -69
- data/app/assets/stylesheets/lines/fonts.scss +2 -2
- data/app/assets/stylesheets/lines/footer.scss +10 -56
- data/app/assets/stylesheets/lines/general.scss +18 -13
- data/app/assets/stylesheets/lines/media_queries.scss +5 -1
- data/app/assets/stylesheets/lines/messages.scss +28 -0
- data/app/assets/stylesheets/lines/navbar.scss +199 -122
- data/app/assets/stylesheets/lines/pagination.scss +8 -31
- data/app/assets/stylesheets/lines/pygments.css.erb +1 -2
- data/app/assets/stylesheets/lines/variables_and_mixins.scss +4 -0
- data/app/controllers/lines/admin/articles_controller.rb +8 -6
- data/app/controllers/lines/admin/authors_controller.rb +2 -2
- data/app/controllers/lines/admin/pictures_controller.rb +1 -1
- data/app/controllers/lines/application_controller.rb +1 -1
- data/app/controllers/lines/articles_controller.rb +3 -1
- data/app/controllers/lines/password_resets_controller.rb +4 -7
- data/app/controllers/lines/sessions_controller.rb +3 -3
- data/app/helpers/lines/application_helper.rb +25 -4
- data/app/mailers/lines/user_mailer.rb +1 -1
- data/app/models/lines/article.rb +13 -3
- data/app/models/lines/user.rb +2 -2
- data/app/uploaders/picture_uploader.rb +1 -1
- data/app/views/layouts/lines/_markdown_cheatsheet.html.erb +72 -0
- data/app/views/layouts/lines/admin.html.erb +15 -4
- data/app/views/layouts/lines/application.html.erb +16 -4
- data/app/views/layouts/lines/preview.html.erb +30 -2
- data/app/views/lines/admin/articles/_form.html.erb +50 -148
- data/app/views/lines/admin/articles/_picture_box.html.erb +37 -8
- data/app/views/lines/admin/articles/edit.html.erb +2 -12
- data/app/views/lines/admin/articles/index.html.erb +40 -28
- data/app/views/lines/admin/articles/new.html.erb +3 -10
- data/app/views/lines/admin/articles/show.html.erb +6 -4
- data/app/views/lines/admin/authors/_form.html.erb +12 -41
- data/app/views/lines/admin/authors/index.html.erb +18 -13
- data/app/views/lines/admin/authors/show.html.erb +19 -48
- data/app/views/lines/admin/pictures/_picture.html.erb +5 -4
- data/app/views/lines/admin/pictures/create.js.erb +1 -1
- data/app/views/lines/admin/pictures/destroy.js.erb +1 -1
- data/app/views/lines/articles/_article.html.erb +10 -6
- data/app/views/lines/articles/_article_collection.html.erb +1 -1
- data/app/views/lines/articles/_article_small.html.erb +9 -7
- data/app/views/lines/articles/index.atom.builder +10 -9
- data/app/views/lines/articles/index.html.erb +2 -2
- data/app/views/lines/articles/show.html.erb +5 -1
- data/app/views/lines/password_resets/edit.html.erb +25 -12
- data/app/views/lines/password_resets/new.html.erb +14 -8
- data/app/views/lines/sessions/new.html.erb +6 -10
- data/app/views/lines/shared/_flash.html.erb +1 -1
- data/app/views/lines/shared/_footer.html.erb +5 -28
- data/app/views/lines/user_mailer/password_reset.html.erb +6 -5
- data/app/views/lines/user_mailer/password_reset.text.erb +8 -4
- data/config/lines_config.yml +15 -14
- data/config/routes.rb +2 -2
- data/db/seeds.rb +5 -5
- data/lib/lines/engine.rb +1 -1
- data/lib/lines/version.rb +1 -1
- data/lines.gemspec +1 -1
- data/public/codemirror/.gitattributes +8 -0
- data/public/codemirror/.gitignore +8 -0
- data/public/codemirror/.npmignore +9 -0
- data/public/codemirror/.travis.yml +4 -0
- data/public/codemirror/AUTHORS +474 -0
- data/public/codemirror/CONTRIBUTING.md +88 -0
- data/public/codemirror/LICENSE +19 -0
- data/public/codemirror/README.md +27 -0
- data/public/codemirror/addon/comment/comment.js +183 -0
- data/public/codemirror/addon/comment/continuecomment.js +85 -0
- data/public/codemirror/addon/dialog/dialog.css +32 -0
- data/public/codemirror/addon/dialog/dialog.js +157 -0
- data/public/codemirror/addon/display/fullscreen.css +6 -0
- data/public/codemirror/addon/display/fullscreen.js +41 -0
- data/public/codemirror/addon/display/panel.js +112 -0
- data/public/codemirror/addon/display/placeholder.js +58 -0
- data/public/codemirror/addon/display/rulers.js +63 -0
- data/public/codemirror/addon/edit/closebrackets.js +185 -0
- data/public/codemirror/addon/edit/closetag.js +166 -0
- data/public/codemirror/addon/edit/continuelist.js +51 -0
- data/public/codemirror/addon/edit/matchbrackets.js +120 -0
- data/public/codemirror/addon/edit/matchtags.js +66 -0
- data/public/codemirror/addon/edit/trailingspace.js +27 -0
- data/public/codemirror/addon/fold/brace-fold.js +105 -0
- data/public/codemirror/addon/fold/comment-fold.js +57 -0
- data/public/codemirror/addon/fold/foldcode.js +149 -0
- data/public/codemirror/addon/fold/foldgutter.css +20 -0
- data/public/codemirror/addon/fold/foldgutter.js +146 -0
- data/public/codemirror/addon/fold/indent-fold.js +44 -0
- data/public/codemirror/addon/fold/markdown-fold.js +49 -0
- data/public/codemirror/addon/fold/xml-fold.js +182 -0
- data/public/codemirror/addon/hint/anyword-hint.js +41 -0
- data/public/codemirror/addon/hint/css-hint.js +60 -0
- data/public/codemirror/addon/hint/html-hint.js +348 -0
- data/public/codemirror/addon/hint/javascript-hint.js +146 -0
- data/public/codemirror/addon/hint/show-hint.css +38 -0
- data/public/codemirror/addon/hint/show-hint.js +386 -0
- data/public/codemirror/addon/hint/sql-hint.js +254 -0
- data/public/codemirror/addon/hint/xml-hint.js +110 -0
- data/public/codemirror/addon/lint/coffeescript-lint.js +41 -0
- data/public/codemirror/addon/lint/css-lint.js +35 -0
- data/public/codemirror/addon/lint/javascript-lint.js +136 -0
- data/public/codemirror/addon/lint/json-lint.js +31 -0
- data/public/codemirror/addon/lint/lint.css +73 -0
- data/public/codemirror/addon/lint/lint.js +207 -0
- data/public/codemirror/addon/lint/yaml-lint.js +28 -0
- data/public/codemirror/addon/merge/merge.css +112 -0
- data/public/codemirror/addon/merge/merge.js +775 -0
- data/public/codemirror/addon/mode/loadmode.js +64 -0
- data/public/codemirror/addon/mode/multiplex.js +123 -0
- data/public/codemirror/addon/mode/multiplex_test.js +33 -0
- data/public/codemirror/addon/mode/overlay.js +85 -0
- data/public/codemirror/addon/mode/simple.js +213 -0
- data/public/codemirror/addon/runmode/colorize.js +40 -0
- data/public/codemirror/addon/runmode/runmode-standalone.js +157 -0
- data/public/codemirror/addon/runmode/runmode.js +72 -0
- data/public/codemirror/addon/runmode/runmode.node.js +178 -0
- data/public/codemirror/addon/scroll/annotatescrollbar.js +115 -0
- data/public/codemirror/addon/scroll/scrollpastend.js +46 -0
- data/public/codemirror/addon/scroll/simplescrollbars.css +66 -0
- data/public/codemirror/addon/scroll/simplescrollbars.js +147 -0
- data/public/codemirror/addon/search/match-highlighter.js +128 -0
- data/public/codemirror/addon/search/matchesonscrollbar.css +8 -0
- data/public/codemirror/addon/search/matchesonscrollbar.js +97 -0
- data/public/codemirror/addon/search/search.js +202 -0
- data/public/codemirror/addon/search/searchcursor.js +189 -0
- data/public/codemirror/addon/selection/active-line.js +71 -0
- data/public/codemirror/addon/selection/mark-selection.js +118 -0
- data/public/codemirror/addon/selection/selection-pointer.js +98 -0
- data/public/codemirror/addon/tern/tern.css +87 -0
- data/public/codemirror/addon/tern/tern.js +699 -0
- data/public/codemirror/addon/tern/worker.js +44 -0
- data/public/codemirror/addon/wrap/hardwrap.js +139 -0
- data/public/codemirror/bin/authors.sh +6 -0
- data/public/codemirror/bin/compress +92 -0
- data/public/codemirror/bin/lint +3 -0
- data/public/codemirror/bin/release +45 -0
- data/public/codemirror/bin/source-highlight +51 -0
- data/public/codemirror/bower.json +17 -0
- data/public/codemirror/demo/activeline.html +78 -0
- data/public/codemirror/demo/anywordhint.html +79 -0
- data/public/codemirror/demo/bidi.html +74 -0
- data/public/codemirror/demo/btree.html +85 -0
- data/public/codemirror/demo/buffers.html +109 -0
- data/public/codemirror/demo/changemode.html +58 -0
- data/public/codemirror/demo/closebrackets.html +52 -0
- data/public/codemirror/demo/closetag.html +41 -0
- data/public/codemirror/demo/complete.html +79 -0
- data/public/codemirror/demo/emacs.html +75 -0
- data/public/codemirror/demo/folding.html +95 -0
- data/public/codemirror/demo/fullscreen.html +83 -0
- data/public/codemirror/demo/hardwrap.html +72 -0
- data/public/codemirror/demo/html5complete.html +56 -0
- data/public/codemirror/demo/indentwrap.html +59 -0
- data/public/codemirror/demo/lint.html +171 -0
- data/public/codemirror/demo/loadmode.html +72 -0
- data/public/codemirror/demo/marker.html +52 -0
- data/public/codemirror/demo/markselection.html +52 -0
- data/public/codemirror/demo/matchhighlighter.html +47 -0
- data/public/codemirror/demo/matchtags.html +48 -0
- data/public/codemirror/demo/merge.html +122 -0
- data/public/codemirror/demo/multiplex.html +75 -0
- data/public/codemirror/demo/mustache.html +69 -0
- data/public/codemirror/demo/panel.html +136 -0
- data/public/codemirror/demo/placeholder.html +45 -0
- data/public/codemirror/demo/preview.html +87 -0
- data/public/codemirror/demo/requirejs.html +70 -0
- data/public/codemirror/demo/resize.html +51 -0
- data/public/codemirror/demo/rulers.html +49 -0
- data/public/codemirror/demo/runmode.html +62 -0
- data/public/codemirror/demo/search.html +95 -0
- data/public/codemirror/demo/simplemode.html +186 -0
- data/public/codemirror/demo/simplescrollbars.html +82 -0
- data/public/codemirror/demo/spanaffectswrapping_shim.html +85 -0
- data/public/codemirror/demo/sublime.html +76 -0
- data/public/codemirror/demo/tern.html +133 -0
- data/public/codemirror/demo/theme.html +152 -0
- data/public/codemirror/demo/trailingspace.html +48 -0
- data/public/codemirror/demo/variableheight.html +67 -0
- data/public/codemirror/demo/vim.html +104 -0
- data/public/codemirror/demo/visibletabs.html +62 -0
- data/public/codemirror/demo/widget.html +85 -0
- data/public/codemirror/demo/xmlcomplete.html +119 -0
- data/public/codemirror/doc/activebookmark.js +57 -0
- data/public/codemirror/doc/compress.html +329 -0
- data/public/codemirror/doc/docs.css +271 -0
- data/public/codemirror/doc/internals.html +503 -0
- data/public/codemirror/doc/logo.png +0 -0
- data/public/codemirror/doc/logo.svg +181 -0
- data/public/codemirror/doc/manual.html +3327 -0
- data/public/codemirror/doc/realworld.html +174 -0
- data/public/codemirror/doc/releases.html +1116 -0
- data/public/codemirror/doc/reporting.html +61 -0
- data/public/codemirror/doc/upgrade_v2.2.html +96 -0
- data/public/codemirror/doc/upgrade_v3.html +230 -0
- data/public/codemirror/doc/upgrade_v4.html +144 -0
- data/public/codemirror/doc/yinyang.png +0 -0
- data/public/codemirror/index.html +199 -0
- data/public/codemirror/keymap/emacs.js +412 -0
- data/public/codemirror/keymap/sublime.js +555 -0
- data/public/codemirror/keymap/vim.js +5060 -0
- data/public/codemirror/lib/codemirror.css +332 -0
- data/public/codemirror/lib/codemirror.js +8788 -0
- data/public/codemirror/mode/apl/apl.js +174 -0
- data/public/codemirror/mode/apl/index.html +72 -0
- data/public/codemirror/mode/asciiarmor/asciiarmor.js +73 -0
- data/public/codemirror/mode/asciiarmor/index.html +46 -0
- data/public/codemirror/mode/asn.1/asn.1.js +204 -0
- data/public/codemirror/mode/asn.1/index.html +78 -0
- data/public/codemirror/mode/asterisk/asterisk.js +196 -0
- data/public/codemirror/mode/asterisk/index.html +154 -0
- data/public/codemirror/mode/brainfuck/brainfuck.js +85 -0
- data/public/codemirror/mode/brainfuck/index.html +85 -0
- data/public/codemirror/mode/clike/clike.js +604 -0
- data/public/codemirror/mode/clike/index.html +252 -0
- data/public/codemirror/mode/clike/scala.html +767 -0
- data/public/codemirror/mode/clike/test.js +33 -0
- data/public/codemirror/mode/clojure/clojure.js +244 -0
- data/public/codemirror/mode/clojure/index.html +88 -0
- data/public/codemirror/mode/cmake/cmake.js +97 -0
- data/public/codemirror/mode/cmake/index.html +129 -0
- data/public/codemirror/mode/cobol/cobol.js +255 -0
- data/public/codemirror/mode/cobol/index.html +210 -0
- data/public/codemirror/mode/coffeescript/coffeescript.js +369 -0
- data/public/codemirror/mode/coffeescript/index.html +740 -0
- data/public/codemirror/mode/commonlisp/commonlisp.js +123 -0
- data/public/codemirror/mode/commonlisp/index.html +177 -0
- data/public/codemirror/mode/css/css.js +756 -0
- data/public/codemirror/mode/css/index.html +75 -0
- data/public/codemirror/mode/css/less.html +152 -0
- data/public/codemirror/mode/css/less_test.js +54 -0
- data/public/codemirror/mode/css/scss.html +157 -0
- data/public/codemirror/mode/css/scss_test.js +110 -0
- data/public/codemirror/mode/css/test.js +188 -0
- data/public/codemirror/mode/cypher/cypher.js +146 -0
- data/public/codemirror/mode/cypher/index.html +63 -0
- data/public/codemirror/mode/d/d.js +218 -0
- data/public/codemirror/mode/d/index.html +273 -0
- data/public/codemirror/mode/dart/dart.js +50 -0
- data/public/codemirror/mode/dart/index.html +71 -0
- data/public/codemirror/mode/diff/diff.js +47 -0
- data/public/codemirror/mode/diff/index.html +117 -0
- data/public/codemirror/mode/django/django.js +350 -0
- data/public/codemirror/mode/django/index.html +73 -0
- data/public/codemirror/mode/dockerfile/dockerfile.js +76 -0
- data/public/codemirror/mode/dockerfile/index.html +73 -0
- data/public/codemirror/mode/dtd/dtd.js +142 -0
- data/public/codemirror/mode/dtd/index.html +89 -0
- data/public/codemirror/mode/dylan/dylan.js +291 -0
- data/public/codemirror/mode/dylan/index.html +407 -0
- data/public/codemirror/mode/ebnf/ebnf.js +195 -0
- data/public/codemirror/mode/ebnf/index.html +102 -0
- data/public/codemirror/mode/ecl/ecl.js +206 -0
- data/public/codemirror/mode/ecl/index.html +52 -0
- data/public/codemirror/mode/eiffel/eiffel.js +160 -0
- data/public/codemirror/mode/eiffel/index.html +429 -0
- data/public/codemirror/mode/elm/elm.js +205 -0
- data/public/codemirror/mode/elm/index.html +61 -0
- data/public/codemirror/mode/erlang/erlang.js +618 -0
- data/public/codemirror/mode/erlang/index.html +76 -0
- data/public/codemirror/mode/factor/factor.js +83 -0
- data/public/codemirror/mode/factor/index.html +77 -0
- data/public/codemirror/mode/forth/forth.js +180 -0
- data/public/codemirror/mode/forth/index.html +75 -0
- data/public/codemirror/mode/fortran/fortran.js +188 -0
- data/public/codemirror/mode/fortran/index.html +81 -0
- data/public/codemirror/mode/gas/gas.js +345 -0
- data/public/codemirror/mode/gas/index.html +68 -0
- data/public/codemirror/mode/gfm/gfm.js +124 -0
- data/public/codemirror/mode/gfm/index.html +93 -0
- data/public/codemirror/mode/gfm/test.js +213 -0
- data/public/codemirror/mode/gherkin/gherkin.js +178 -0
- data/public/codemirror/mode/gherkin/index.html +48 -0
- data/public/codemirror/mode/go/go.js +185 -0
- data/public/codemirror/mode/go/index.html +85 -0
- data/public/codemirror/mode/groovy/groovy.js +230 -0
- data/public/codemirror/mode/groovy/index.html +84 -0
- data/public/codemirror/mode/haml/haml.js +159 -0
- data/public/codemirror/mode/haml/index.html +79 -0
- data/public/codemirror/mode/haml/test.js +97 -0
- data/public/codemirror/mode/handlebars/handlebars.js +53 -0
- data/public/codemirror/mode/handlebars/index.html +83 -0
- data/public/codemirror/mode/haskell/haskell.js +267 -0
- data/public/codemirror/mode/haskell/index.html +73 -0
- data/public/codemirror/mode/haxe/haxe.js +518 -0
- data/public/codemirror/mode/haxe/index.html +124 -0
- data/public/codemirror/mode/htmlembedded/htmlembedded.js +28 -0
- data/public/codemirror/mode/htmlembedded/index.html +59 -0
- data/public/codemirror/mode/htmlmixed/htmlmixed.js +121 -0
- data/public/codemirror/mode/htmlmixed/index.html +89 -0
- data/public/codemirror/mode/http/http.js +113 -0
- data/public/codemirror/mode/http/index.html +45 -0
- data/public/codemirror/mode/idl/idl.js +290 -0
- data/public/codemirror/mode/idl/index.html +64 -0
- data/public/codemirror/mode/index.html +149 -0
- data/public/codemirror/mode/jade/index.html +70 -0
- data/public/codemirror/mode/jade/jade.js +590 -0
- data/public/codemirror/mode/javascript/index.html +114 -0
- data/public/codemirror/mode/javascript/javascript.js +704 -0
- data/public/codemirror/mode/javascript/json-ld.html +72 -0
- data/public/codemirror/mode/javascript/test.js +205 -0
- data/public/codemirror/mode/javascript/typescript.html +61 -0
- data/public/codemirror/mode/jinja2/index.html +54 -0
- data/public/codemirror/mode/jinja2/jinja2.js +142 -0
- data/public/codemirror/mode/julia/index.html +195 -0
- data/public/codemirror/mode/julia/julia.js +299 -0
- data/public/codemirror/mode/kotlin/index.html +89 -0
- data/public/codemirror/mode/kotlin/kotlin.js +284 -0
- data/public/codemirror/mode/livescript/index.html +459 -0
- data/public/codemirror/mode/livescript/livescript.js +280 -0
- data/public/codemirror/mode/lua/index.html +85 -0
- data/public/codemirror/mode/lua/lua.js +159 -0
- data/public/codemirror/mode/markdown/index.html +359 -0
- data/public/codemirror/mode/markdown/markdown.js +781 -0
- data/public/codemirror/mode/markdown/test.js +792 -0
- data/public/codemirror/mode/mathematica/index.html +72 -0
- data/public/codemirror/mode/mathematica/mathematica.js +175 -0
- data/public/codemirror/mode/meta.js +190 -0
- data/public/codemirror/mode/mirc/index.html +160 -0
- data/public/codemirror/mode/mirc/mirc.js +193 -0
- data/public/codemirror/mode/mllike/index.html +179 -0
- data/public/codemirror/mode/mllike/mllike.js +205 -0
- data/public/codemirror/mode/modelica/index.html +67 -0
- data/public/codemirror/mode/modelica/modelica.js +245 -0
- data/public/codemirror/mode/mumps/index.html +85 -0
- data/public/codemirror/mode/mumps/mumps.js +148 -0
- data/public/codemirror/mode/nginx/index.html +181 -0
- data/public/codemirror/mode/nginx/nginx.js +178 -0
- data/public/codemirror/mode/ntriples/index.html +45 -0
- data/public/codemirror/mode/ntriples/ntriples.js +186 -0
- data/public/codemirror/mode/octave/index.html +83 -0
- data/public/codemirror/mode/octave/octave.js +135 -0
- data/public/codemirror/mode/pascal/index.html +61 -0
- data/public/codemirror/mode/pascal/pascal.js +109 -0
- data/public/codemirror/mode/pegjs/index.html +66 -0
- data/public/codemirror/mode/pegjs/pegjs.js +114 -0
- data/public/codemirror/mode/perl/index.html +75 -0
- data/public/codemirror/mode/perl/perl.js +837 -0
- data/public/codemirror/mode/php/index.html +64 -0
- data/public/codemirror/mode/php/php.js +230 -0
- data/public/codemirror/mode/php/test.js +154 -0
- data/public/codemirror/mode/pig/index.html +55 -0
- data/public/codemirror/mode/pig/pig.js +178 -0
- data/public/codemirror/mode/properties/index.html +53 -0
- data/public/codemirror/mode/properties/properties.js +78 -0
- data/public/codemirror/mode/puppet/index.html +121 -0
- data/public/codemirror/mode/puppet/puppet.js +220 -0
- data/public/codemirror/mode/python/index.html +198 -0
- data/public/codemirror/mode/python/python.js +358 -0
- data/public/codemirror/mode/q/index.html +144 -0
- data/public/codemirror/mode/q/q.js +139 -0
- data/public/codemirror/mode/r/index.html +85 -0
- data/public/codemirror/mode/r/r.js +162 -0
- data/public/codemirror/mode/rpm/changes/index.html +66 -0
- data/public/codemirror/mode/rpm/index.html +149 -0
- data/public/codemirror/mode/rpm/rpm.js +101 -0
- data/public/codemirror/mode/rst/index.html +535 -0
- data/public/codemirror/mode/rst/rst.js +557 -0
- data/public/codemirror/mode/ruby/index.html +183 -0
- data/public/codemirror/mode/ruby/ruby.js +285 -0
- data/public/codemirror/mode/ruby/test.js +14 -0
- data/public/codemirror/mode/rust/index.html +60 -0
- data/public/codemirror/mode/rust/rust.js +451 -0
- data/public/codemirror/mode/sass/index.html +66 -0
- data/public/codemirror/mode/sass/sass.js +414 -0
- data/public/codemirror/mode/scheme/index.html +77 -0
- data/public/codemirror/mode/scheme/scheme.js +249 -0
- data/public/codemirror/mode/shell/index.html +66 -0
- data/public/codemirror/mode/shell/shell.js +139 -0
- data/public/codemirror/mode/shell/test.js +58 -0
- data/public/codemirror/mode/sieve/index.html +93 -0
- data/public/codemirror/mode/sieve/sieve.js +193 -0
- data/public/codemirror/mode/slim/index.html +96 -0
- data/public/codemirror/mode/slim/slim.js +575 -0
- data/public/codemirror/mode/slim/test.js +96 -0
- data/public/codemirror/mode/smalltalk/index.html +68 -0
- data/public/codemirror/mode/smalltalk/smalltalk.js +168 -0
- data/public/codemirror/mode/smarty/index.html +138 -0
- data/public/codemirror/mode/smarty/smarty.js +225 -0
- data/public/codemirror/mode/solr/index.html +57 -0
- data/public/codemirror/mode/solr/solr.js +104 -0
- data/public/codemirror/mode/soy/index.html +68 -0
- data/public/codemirror/mode/soy/soy.js +198 -0
- data/public/codemirror/mode/sparql/index.html +61 -0
- data/public/codemirror/mode/sparql/sparql.js +174 -0
- data/public/codemirror/mode/spreadsheet/index.html +42 -0
- data/public/codemirror/mode/spreadsheet/spreadsheet.js +109 -0
- data/public/codemirror/mode/sql/index.html +84 -0
- data/public/codemirror/mode/sql/sql.js +391 -0
- data/public/codemirror/mode/stex/index.html +110 -0
- data/public/codemirror/mode/stex/stex.js +251 -0
- data/public/codemirror/mode/stex/test.js +123 -0
- data/public/codemirror/mode/stylus/index.html +106 -0
- data/public/codemirror/mode/stylus/stylus.js +768 -0
- data/public/codemirror/mode/swift/index.html +88 -0
- data/public/codemirror/mode/swift/swift.js +203 -0
- data/public/codemirror/mode/tcl/index.html +142 -0
- data/public/codemirror/mode/tcl/tcl.js +147 -0
- data/public/codemirror/mode/textile/index.html +191 -0
- data/public/codemirror/mode/textile/test.js +417 -0
- data/public/codemirror/mode/textile/textile.js +469 -0
- data/public/codemirror/mode/tiddlywiki/index.html +154 -0
- data/public/codemirror/mode/tiddlywiki/tiddlywiki.css +14 -0
- data/public/codemirror/mode/tiddlywiki/tiddlywiki.js +358 -0
- data/public/codemirror/mode/tiki/index.html +95 -0
- data/public/codemirror/mode/tiki/tiki.css +26 -0
- data/public/codemirror/mode/tiki/tiki.js +312 -0
- data/public/codemirror/mode/toml/index.html +73 -0
- data/public/codemirror/mode/toml/toml.js +88 -0
- data/public/codemirror/mode/tornado/index.html +63 -0
- data/public/codemirror/mode/tornado/tornado.js +68 -0
- data/public/codemirror/mode/troff/index.html +146 -0
- data/public/codemirror/mode/troff/troff.js +82 -0
- data/public/codemirror/mode/ttcn-cfg/index.html +115 -0
- data/public/codemirror/mode/ttcn-cfg/ttcn-cfg.js +214 -0
- data/public/codemirror/mode/ttcn/index.html +118 -0
- data/public/codemirror/mode/ttcn/ttcn.js +283 -0
- data/public/codemirror/mode/turtle/index.html +50 -0
- data/public/codemirror/mode/turtle/turtle.js +162 -0
- data/public/codemirror/mode/twig/index.html +45 -0
- data/public/codemirror/mode/twig/twig.js +132 -0
- data/public/codemirror/mode/vb/index.html +102 -0
- data/public/codemirror/mode/vb/vb.js +276 -0
- data/public/codemirror/mode/vbscript/index.html +55 -0
- data/public/codemirror/mode/vbscript/vbscript.js +350 -0
- data/public/codemirror/mode/velocity/index.html +118 -0
- data/public/codemirror/mode/velocity/velocity.js +201 -0
- data/public/codemirror/mode/verilog/index.html +120 -0
- data/public/codemirror/mode/verilog/test.js +273 -0
- data/public/codemirror/mode/verilog/verilog.js +537 -0
- data/public/codemirror/mode/vhdl/index.html +95 -0
- data/public/codemirror/mode/vhdl/vhdl.js +189 -0
- data/public/codemirror/mode/xml/index.html +57 -0
- data/public/codemirror/mode/xml/test.js +51 -0
- data/public/codemirror/mode/xml/xml.js +385 -0
- data/public/codemirror/mode/xquery/index.html +210 -0
- data/public/codemirror/mode/xquery/test.js +67 -0
- data/public/codemirror/mode/xquery/xquery.js +437 -0
- data/public/codemirror/mode/yaml/index.html +80 -0
- data/public/codemirror/mode/yaml/yaml.js +117 -0
- data/public/codemirror/mode/z80/index.html +53 -0
- data/public/codemirror/mode/z80/z80.js +116 -0
- data/public/codemirror/package.json +20 -0
- data/public/codemirror/test/comment_test.js +100 -0
- data/public/codemirror/test/doc_test.js +371 -0
- data/public/codemirror/test/driver.js +138 -0
- data/public/codemirror/test/emacs_test.js +147 -0
- data/public/codemirror/test/index.html +241 -0
- data/public/codemirror/test/lint.js +11 -0
- data/public/codemirror/test/mode_test.css +23 -0
- data/public/codemirror/test/mode_test.js +192 -0
- data/public/codemirror/test/multi_test.js +285 -0
- data/public/codemirror/test/phantom_driver.js +31 -0
- data/public/codemirror/test/run.js +31 -0
- data/public/codemirror/test/scroll_test.js +115 -0
- data/public/codemirror/test/search_test.js +62 -0
- data/public/codemirror/test/sql-hint-test.js +189 -0
- data/public/codemirror/test/sublime_test.js +303 -0
- data/public/codemirror/test/test.js +2142 -0
- data/public/codemirror/test/vim_test.js +3955 -0
- data/public/codemirror/theme/3024-day.css +41 -0
- data/public/codemirror/theme/3024-night.css +39 -0
- data/public/codemirror/theme/ambiance-mobile.css +5 -0
- data/public/codemirror/theme/ambiance.css +76 -0
- data/public/codemirror/theme/base16-dark.css +38 -0
- data/public/codemirror/theme/base16-light.css +38 -0
- data/public/codemirror/theme/blackboard.css +32 -0
- data/public/codemirror/theme/cobalt.css +25 -0
- data/public/codemirror/theme/colorforth.css +33 -0
- data/public/codemirror/theme/dracula.css +87 -0
- data/public/codemirror/theme/eclipse.css +23 -0
- data/public/codemirror/theme/elegant.css +13 -0
- data/public/codemirror/theme/erlang-dark.css +34 -0
- data/public/codemirror/theme/icecoder.css +42 -0
- data/public/codemirror/theme/lesser-dark.css +47 -0
- data/public/codemirror/theme/lines.css +109 -0
- data/public/codemirror/theme/liquibyte.css +95 -0
- data/public/codemirror/theme/material.css +105 -0
- data/public/codemirror/theme/mbo.css +37 -0
- data/public/codemirror/theme/mdn-like.css +46 -0
- data/public/codemirror/theme/midnight.css +47 -0
- data/public/codemirror/theme/monokai.css +35 -0
- data/public/codemirror/theme/neat.css +12 -0
- data/public/codemirror/theme/neo.css +43 -0
- data/public/codemirror/theme/night.css +28 -0
- data/public/codemirror/theme/paraiso-dark.css +38 -0
- data/public/codemirror/theme/paraiso-light.css +38 -0
- data/public/codemirror/theme/pastel-on-dark.css +53 -0
- data/public/codemirror/theme/rubyblue.css +25 -0
- data/public/codemirror/theme/seti.css +88 -0
- data/public/codemirror/theme/solarized.css +165 -0
- data/public/codemirror/theme/the-matrix.css +30 -0
- data/public/codemirror/theme/tomorrow-night-bright.css +35 -0
- data/public/codemirror/theme/tomorrow-night-eighties.css +38 -0
- data/public/codemirror/theme/ttcn.css +65 -0
- data/public/codemirror/theme/twilight.css +32 -0
- data/public/codemirror/theme/vibrant-ink.css +34 -0
- data/public/codemirror/theme/xq-dark.css +53 -0
- data/public/codemirror/theme/xq-light.css +43 -0
- data/public/codemirror/theme/yeti.css +86 -0
- data/public/codemirror/theme/zenburn.css +37 -0
- data/public/fira-mono/FiraMono-Bold.eot +0 -0
- data/public/fira-mono/FiraMono-Bold.otf +0 -0
- data/public/fira-mono/FiraMono-Bold.ttf +0 -0
- data/public/fira-mono/FiraMono-Bold.woff +0 -0
- data/public/fira-mono/FiraMono-Medium.eot +0 -0
- data/public/fira-mono/FiraMono-Medium.otf +0 -0
- data/public/fira-mono/FiraMono-Medium.ttf +0 -0
- data/public/fira-mono/FiraMono-Medium.woff +0 -0
- data/public/fira-mono/FiraMono-Regular.eot +0 -0
- data/public/fira-mono/FiraMono-Regular.otf +0 -0
- data/public/fira-mono/FiraMono-Regular.ttf +0 -0
- data/public/fira-mono/FiraMono-Regular.woff +0 -0
- data/public/fira-mono/fira-mono.css +32 -0
- data/public/heroes/lines_default_01.png +0 -0
- data/public/heroes/lines_default_02.png +0 -0
- data/public/heroes/lines_default_03.png +0 -0
- data/public/iconfont/iconfont.css +48 -0
- data/public/iconfont/iconfont.eot +0 -0
- data/public/iconfont/iconfont.svg +18 -0
- data/public/iconfont/iconfont.ttf +0 -0
- data/public/iconfont/iconfont.woff +0 -0
- data/spec/dummy/config/environments/test.rb +3 -1
- data/spec/dummy/db/migrate/20140505122014_base_migration.rb +84 -0
- data/spec/dummy/db/migrate/20140702160602_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb +31 -0
- data/spec/dummy/db/migrate/20140702160603_add_missing_unique_indices.acts_as_taggable_on_engine.rb +20 -0
- data/spec/dummy/db/migrate/20140702160604_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +15 -0
- data/spec/dummy/db/migrate/20141027143656_add_teaser_to_article.rb +5 -0
- data/spec/dummy/db/migrate/20150421093311_add_reset_password_fields_to_users.rb +6 -0
- data/spec/dummy/db/schema.rb +50 -50
- data/spec/dummy/db/seeds.rb +5 -5
- data/spec/factories/users.rb +1 -1
- data/spec/features/article_spec.rb +4 -4
- data/spec/features/password_reset_spec.rb +17 -17
- data/spec/features/user_logs_in_spec.rb +6 -8
- data/spec/mailers/lines/user_mailer_spec.rb +1 -1
- data/spec/models/article_spec.rb +6 -6
- data/spec/support/auth_macros.rb +2 -2
- metadata +492 -26
- metadata.gz.sig +0 -0
- data/app/assets/images/ic_gplus.png +0 -0
- data/app/assets/images/ic_gplus_hover.png +0 -0
- data/app/assets/images/logo.png +0 -0
- data/app/assets/images/logo_opoloo.png +0 -0
- data/app/assets/images/signet.png +0 -0
- data/app/assets/javascripts/lines/admin.js +0 -201
- data/app/assets/stylesheets/lines/admin.scss +0 -970
- data/app/views/layouts/lines/_messages.html.erb +0 -8
- data/app/views/lines/admin/articles/_formatting_guide.html.erb +0 -89
- data/public/heroes/001.jpg +0 -0
- data/public/heroes/001_dark.jpg +0 -0
- data/public/heroes/002.jpg +0 -0
- data/public/heroes/002_dark.jpg +0 -0
- data/public/heroes/003.jpg +0 -0
- data/public/heroes/003_dark.jpg +0 -0
- data/spec/dummy/config/lines_config.yml +0 -58
@@ -0,0 +1,775 @@
|
|
1
|
+
// CodeMirror, copyright (c) by Marijn Haverbeke and others
|
2
|
+
// Distributed under an MIT license: http://codemirror.net/LICENSE
|
3
|
+
|
4
|
+
// declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
|
5
|
+
|
6
|
+
(function(mod) {
|
7
|
+
if (typeof exports == "object" && typeof module == "object") // CommonJS
|
8
|
+
mod(require("../../lib/codemirror"), require("diff_match_patch"));
|
9
|
+
else if (typeof define == "function" && define.amd) // AMD
|
10
|
+
define(["../../lib/codemirror", "diff_match_patch"], mod);
|
11
|
+
else // Plain browser env
|
12
|
+
mod(CodeMirror, diff_match_patch);
|
13
|
+
})(function(CodeMirror, diff_match_patch) {
|
14
|
+
"use strict";
|
15
|
+
var Pos = CodeMirror.Pos;
|
16
|
+
var svgNS = "http://www.w3.org/2000/svg";
|
17
|
+
|
18
|
+
function DiffView(mv, type) {
|
19
|
+
this.mv = mv;
|
20
|
+
this.type = type;
|
21
|
+
this.classes = type == "left"
|
22
|
+
? {chunk: "CodeMirror-merge-l-chunk",
|
23
|
+
start: "CodeMirror-merge-l-chunk-start",
|
24
|
+
end: "CodeMirror-merge-l-chunk-end",
|
25
|
+
insert: "CodeMirror-merge-l-inserted",
|
26
|
+
del: "CodeMirror-merge-l-deleted",
|
27
|
+
connect: "CodeMirror-merge-l-connect"}
|
28
|
+
: {chunk: "CodeMirror-merge-r-chunk",
|
29
|
+
start: "CodeMirror-merge-r-chunk-start",
|
30
|
+
end: "CodeMirror-merge-r-chunk-end",
|
31
|
+
insert: "CodeMirror-merge-r-inserted",
|
32
|
+
del: "CodeMirror-merge-r-deleted",
|
33
|
+
connect: "CodeMirror-merge-r-connect"};
|
34
|
+
}
|
35
|
+
|
36
|
+
DiffView.prototype = {
|
37
|
+
constructor: DiffView,
|
38
|
+
init: function(pane, orig, options) {
|
39
|
+
this.edit = this.mv.edit;
|
40
|
+
(this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
|
41
|
+
this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
|
42
|
+
this.orig.state.diffViews = [this];
|
43
|
+
|
44
|
+
this.diff = getDiff(asString(orig), asString(options.value));
|
45
|
+
this.chunks = getChunks(this.diff);
|
46
|
+
this.diffOutOfDate = this.dealigned = false;
|
47
|
+
|
48
|
+
this.showDifferences = options.showDifferences !== false;
|
49
|
+
this.forceUpdate = registerUpdate(this);
|
50
|
+
setScrollLock(this, true, false);
|
51
|
+
registerScroll(this);
|
52
|
+
},
|
53
|
+
setShowDifferences: function(val) {
|
54
|
+
val = val !== false;
|
55
|
+
if (val != this.showDifferences) {
|
56
|
+
this.showDifferences = val;
|
57
|
+
this.forceUpdate("full");
|
58
|
+
}
|
59
|
+
}
|
60
|
+
};
|
61
|
+
|
62
|
+
function ensureDiff(dv) {
|
63
|
+
if (dv.diffOutOfDate) {
|
64
|
+
dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
|
65
|
+
dv.chunks = getChunks(dv.diff);
|
66
|
+
dv.diffOutOfDate = false;
|
67
|
+
CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
|
68
|
+
}
|
69
|
+
}
|
70
|
+
|
71
|
+
var updating = false;
|
72
|
+
function registerUpdate(dv) {
|
73
|
+
var edit = {from: 0, to: 0, marked: []};
|
74
|
+
var orig = {from: 0, to: 0, marked: []};
|
75
|
+
var debounceChange, updatingFast = false;
|
76
|
+
function update(mode) {
|
77
|
+
updating = true;
|
78
|
+
updatingFast = false;
|
79
|
+
if (mode == "full") {
|
80
|
+
if (dv.svg) clear(dv.svg);
|
81
|
+
if (dv.copyButtons) clear(dv.copyButtons);
|
82
|
+
clearMarks(dv.edit, edit.marked, dv.classes);
|
83
|
+
clearMarks(dv.orig, orig.marked, dv.classes);
|
84
|
+
edit.from = edit.to = orig.from = orig.to = 0;
|
85
|
+
}
|
86
|
+
ensureDiff(dv);
|
87
|
+
if (dv.showDifferences) {
|
88
|
+
updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
|
89
|
+
updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
|
90
|
+
}
|
91
|
+
makeConnections(dv);
|
92
|
+
|
93
|
+
if (dv.mv.options.connect == "align")
|
94
|
+
alignChunks(dv);
|
95
|
+
updating = false;
|
96
|
+
}
|
97
|
+
function setDealign(fast) {
|
98
|
+
if (updating) return;
|
99
|
+
dv.dealigned = true;
|
100
|
+
set(fast);
|
101
|
+
}
|
102
|
+
function set(fast) {
|
103
|
+
if (updating || updatingFast) return;
|
104
|
+
clearTimeout(debounceChange);
|
105
|
+
if (fast === true) updatingFast = true;
|
106
|
+
debounceChange = setTimeout(update, fast === true ? 20 : 250);
|
107
|
+
}
|
108
|
+
function change(_cm, change) {
|
109
|
+
if (!dv.diffOutOfDate) {
|
110
|
+
dv.diffOutOfDate = true;
|
111
|
+
edit.from = edit.to = orig.from = orig.to = 0;
|
112
|
+
}
|
113
|
+
// Update faster when a line was added/removed
|
114
|
+
setDealign(change.text.length - 1 != change.to.line - change.from.line);
|
115
|
+
}
|
116
|
+
dv.edit.on("change", change);
|
117
|
+
dv.orig.on("change", change);
|
118
|
+
dv.edit.on("markerAdded", setDealign);
|
119
|
+
dv.edit.on("markerCleared", setDealign);
|
120
|
+
dv.orig.on("markerAdded", setDealign);
|
121
|
+
dv.orig.on("markerCleared", setDealign);
|
122
|
+
dv.edit.on("viewportChange", function() { set(false); });
|
123
|
+
dv.orig.on("viewportChange", function() { set(false); });
|
124
|
+
update();
|
125
|
+
return update;
|
126
|
+
}
|
127
|
+
|
128
|
+
function registerScroll(dv) {
|
129
|
+
dv.edit.on("scroll", function() {
|
130
|
+
syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
|
131
|
+
});
|
132
|
+
dv.orig.on("scroll", function() {
|
133
|
+
syncScroll(dv, DIFF_DELETE) && makeConnections(dv);
|
134
|
+
});
|
135
|
+
}
|
136
|
+
|
137
|
+
function syncScroll(dv, type) {
|
138
|
+
// Change handler will do a refresh after a timeout when diff is out of date
|
139
|
+
if (dv.diffOutOfDate) return false;
|
140
|
+
if (!dv.lockScroll) return true;
|
141
|
+
var editor, other, now = +new Date;
|
142
|
+
if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
|
143
|
+
else { editor = dv.orig; other = dv.edit; }
|
144
|
+
// Don't take action if the position of this editor was recently set
|
145
|
+
// (to prevent feedback loops)
|
146
|
+
if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
|
147
|
+
|
148
|
+
var sInfo = editor.getScrollInfo();
|
149
|
+
if (dv.mv.options.connect == "align") {
|
150
|
+
targetPos = sInfo.top;
|
151
|
+
} else {
|
152
|
+
var halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
|
153
|
+
var mid = editor.lineAtHeight(midY, "local");
|
154
|
+
var around = chunkBoundariesAround(dv.chunks, mid, type == DIFF_INSERT);
|
155
|
+
var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
|
156
|
+
var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
|
157
|
+
var ratio = (midY - off.top) / (off.bot - off.top);
|
158
|
+
var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
|
159
|
+
|
160
|
+
var botDist, mix;
|
161
|
+
// Some careful tweaking to make sure no space is left out of view
|
162
|
+
// when scrolling to top or bottom.
|
163
|
+
if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
|
164
|
+
targetPos = targetPos * mix + sInfo.top * (1 - mix);
|
165
|
+
} else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
|
166
|
+
var otherInfo = other.getScrollInfo();
|
167
|
+
var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
|
168
|
+
if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
|
169
|
+
targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
|
170
|
+
}
|
171
|
+
}
|
172
|
+
|
173
|
+
other.scrollTo(sInfo.left, targetPos);
|
174
|
+
other.state.scrollSetAt = now;
|
175
|
+
other.state.scrollSetBy = dv;
|
176
|
+
return true;
|
177
|
+
}
|
178
|
+
|
179
|
+
function getOffsets(editor, around) {
|
180
|
+
var bot = around.after;
|
181
|
+
if (bot == null) bot = editor.lastLine() + 1;
|
182
|
+
return {top: editor.heightAtLine(around.before || 0, "local"),
|
183
|
+
bot: editor.heightAtLine(bot, "local")};
|
184
|
+
}
|
185
|
+
|
186
|
+
function setScrollLock(dv, val, action) {
|
187
|
+
dv.lockScroll = val;
|
188
|
+
if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
|
189
|
+
dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db \u21da";
|
190
|
+
}
|
191
|
+
|
192
|
+
// Updating the marks for editor content
|
193
|
+
|
194
|
+
function clearMarks(editor, arr, classes) {
|
195
|
+
for (var i = 0; i < arr.length; ++i) {
|
196
|
+
var mark = arr[i];
|
197
|
+
if (mark instanceof CodeMirror.TextMarker) {
|
198
|
+
mark.clear();
|
199
|
+
} else if (mark.parent) {
|
200
|
+
editor.removeLineClass(mark, "background", classes.chunk);
|
201
|
+
editor.removeLineClass(mark, "background", classes.start);
|
202
|
+
editor.removeLineClass(mark, "background", classes.end);
|
203
|
+
}
|
204
|
+
}
|
205
|
+
arr.length = 0;
|
206
|
+
}
|
207
|
+
|
208
|
+
// FIXME maybe add a margin around viewport to prevent too many updates
|
209
|
+
function updateMarks(editor, diff, state, type, classes) {
|
210
|
+
var vp = editor.getViewport();
|
211
|
+
editor.operation(function() {
|
212
|
+
if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
|
213
|
+
clearMarks(editor, state.marked, classes);
|
214
|
+
markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes);
|
215
|
+
state.from = vp.from; state.to = vp.to;
|
216
|
+
} else {
|
217
|
+
if (vp.from < state.from) {
|
218
|
+
markChanges(editor, diff, type, state.marked, vp.from, state.from, classes);
|
219
|
+
state.from = vp.from;
|
220
|
+
}
|
221
|
+
if (vp.to > state.to) {
|
222
|
+
markChanges(editor, diff, type, state.marked, state.to, vp.to, classes);
|
223
|
+
state.to = vp.to;
|
224
|
+
}
|
225
|
+
}
|
226
|
+
});
|
227
|
+
}
|
228
|
+
|
229
|
+
function markChanges(editor, diff, type, marks, from, to, classes) {
|
230
|
+
var pos = Pos(0, 0);
|
231
|
+
var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
|
232
|
+
var cls = type == DIFF_DELETE ? classes.del : classes.insert;
|
233
|
+
function markChunk(start, end) {
|
234
|
+
var bfrom = Math.max(from, start), bto = Math.min(to, end);
|
235
|
+
for (var i = bfrom; i < bto; ++i) {
|
236
|
+
var line = editor.addLineClass(i, "background", classes.chunk);
|
237
|
+
if (i == start) editor.addLineClass(line, "background", classes.start);
|
238
|
+
if (i == end - 1) editor.addLineClass(line, "background", classes.end);
|
239
|
+
marks.push(line);
|
240
|
+
}
|
241
|
+
// When the chunk is empty, make sure a horizontal line shows up
|
242
|
+
if (start == end && bfrom == end && bto == end) {
|
243
|
+
if (bfrom)
|
244
|
+
marks.push(editor.addLineClass(bfrom - 1, "background", classes.end));
|
245
|
+
else
|
246
|
+
marks.push(editor.addLineClass(bfrom, "background", classes.start));
|
247
|
+
}
|
248
|
+
}
|
249
|
+
|
250
|
+
var chunkStart = 0;
|
251
|
+
for (var i = 0; i < diff.length; ++i) {
|
252
|
+
var part = diff[i], tp = part[0], str = part[1];
|
253
|
+
if (tp == DIFF_EQUAL) {
|
254
|
+
var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1);
|
255
|
+
moveOver(pos, str);
|
256
|
+
var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
|
257
|
+
if (cleanTo > cleanFrom) {
|
258
|
+
if (i) markChunk(chunkStart, cleanFrom);
|
259
|
+
chunkStart = cleanTo;
|
260
|
+
}
|
261
|
+
} else {
|
262
|
+
if (tp == type) {
|
263
|
+
var end = moveOver(pos, str, true);
|
264
|
+
var a = posMax(top, pos), b = posMin(bot, end);
|
265
|
+
if (!posEq(a, b))
|
266
|
+
marks.push(editor.markText(a, b, {className: cls}));
|
267
|
+
pos = end;
|
268
|
+
}
|
269
|
+
}
|
270
|
+
}
|
271
|
+
if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
|
272
|
+
}
|
273
|
+
|
274
|
+
// Updating the gap between editor and original
|
275
|
+
|
276
|
+
function makeConnections(dv) {
|
277
|
+
if (!dv.showDifferences) return;
|
278
|
+
|
279
|
+
if (dv.svg) {
|
280
|
+
clear(dv.svg);
|
281
|
+
var w = dv.gap.offsetWidth;
|
282
|
+
attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
|
283
|
+
}
|
284
|
+
if (dv.copyButtons) clear(dv.copyButtons);
|
285
|
+
|
286
|
+
var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
|
287
|
+
var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
|
288
|
+
for (var i = 0; i < dv.chunks.length; i++) {
|
289
|
+
var ch = dv.chunks[i];
|
290
|
+
if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from &&
|
291
|
+
ch.origFrom <= vpOrig.to && ch.origTo >= vpOrig.from)
|
292
|
+
drawConnectorsForChunk(dv, ch, sTopOrig, sTopEdit, w);
|
293
|
+
}
|
294
|
+
}
|
295
|
+
|
296
|
+
function getMatchingOrigLine(editLine, chunks) {
|
297
|
+
var editStart = 0, origStart = 0;
|
298
|
+
for (var i = 0; i < chunks.length; i++) {
|
299
|
+
var chunk = chunks[i];
|
300
|
+
if (chunk.editTo > editLine && chunk.editFrom <= editLine) return null;
|
301
|
+
if (chunk.editFrom > editLine) break;
|
302
|
+
editStart = chunk.editTo;
|
303
|
+
origStart = chunk.origTo;
|
304
|
+
}
|
305
|
+
return origStart + (editLine - editStart);
|
306
|
+
}
|
307
|
+
|
308
|
+
function findAlignedLines(dv, other) {
|
309
|
+
var linesToAlign = [];
|
310
|
+
for (var i = 0; i < dv.chunks.length; i++) {
|
311
|
+
var chunk = dv.chunks[i];
|
312
|
+
linesToAlign.push([chunk.origTo, chunk.editTo, other ? getMatchingOrigLine(chunk.editTo, other.chunks) : null]);
|
313
|
+
}
|
314
|
+
if (other) {
|
315
|
+
for (var i = 0; i < other.chunks.length; i++) {
|
316
|
+
var chunk = other.chunks[i];
|
317
|
+
for (var j = 0; j < linesToAlign.length; j++) {
|
318
|
+
var align = linesToAlign[j];
|
319
|
+
if (align[1] == chunk.editTo) {
|
320
|
+
j = -1;
|
321
|
+
break;
|
322
|
+
} else if (align[1] > chunk.editTo) {
|
323
|
+
break;
|
324
|
+
}
|
325
|
+
}
|
326
|
+
if (j > -1)
|
327
|
+
linesToAlign.splice(j - 1, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
|
328
|
+
}
|
329
|
+
}
|
330
|
+
return linesToAlign;
|
331
|
+
}
|
332
|
+
|
333
|
+
function alignChunks(dv, force) {
|
334
|
+
if (!dv.dealigned && !force) return;
|
335
|
+
if (!dv.orig.curOp) return dv.orig.operation(function() {
|
336
|
+
alignChunks(dv, force);
|
337
|
+
});
|
338
|
+
|
339
|
+
dv.dealigned = false;
|
340
|
+
var other = dv.mv.left == dv ? dv.mv.right : dv.mv.left;
|
341
|
+
if (other) {
|
342
|
+
ensureDiff(other);
|
343
|
+
other.dealigned = false;
|
344
|
+
}
|
345
|
+
var linesToAlign = findAlignedLines(dv, other);
|
346
|
+
|
347
|
+
// Clear old aligners
|
348
|
+
var aligners = dv.mv.aligners;
|
349
|
+
for (var i = 0; i < aligners.length; i++)
|
350
|
+
aligners[i].clear();
|
351
|
+
aligners.length = 0;
|
352
|
+
|
353
|
+
var cm = [dv.orig, dv.edit], scroll = [];
|
354
|
+
if (other) cm.push(other.orig);
|
355
|
+
for (var i = 0; i < cm.length; i++)
|
356
|
+
scroll.push(cm[i].getScrollInfo().top);
|
357
|
+
|
358
|
+
for (var ln = 0; ln < linesToAlign.length; ln++)
|
359
|
+
alignLines(cm, linesToAlign[ln], aligners);
|
360
|
+
|
361
|
+
for (var i = 0; i < cm.length; i++)
|
362
|
+
cm[i].scrollTo(null, scroll[i]);
|
363
|
+
}
|
364
|
+
|
365
|
+
function alignLines(cm, lines, aligners) {
|
366
|
+
var maxOffset = 0, offset = [];
|
367
|
+
for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
|
368
|
+
var off = cm[i].heightAtLine(lines[i], "local");
|
369
|
+
offset[i] = off;
|
370
|
+
maxOffset = Math.max(maxOffset, off);
|
371
|
+
}
|
372
|
+
for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
|
373
|
+
var diff = maxOffset - offset[i];
|
374
|
+
if (diff > 1)
|
375
|
+
aligners.push(padAbove(cm[i], lines[i], diff));
|
376
|
+
}
|
377
|
+
}
|
378
|
+
|
379
|
+
function padAbove(cm, line, size) {
|
380
|
+
var above = true;
|
381
|
+
if (line > cm.lastLine()) {
|
382
|
+
line--;
|
383
|
+
above = false;
|
384
|
+
}
|
385
|
+
var elt = document.createElement("div");
|
386
|
+
elt.className = "CodeMirror-merge-spacer";
|
387
|
+
elt.style.height = size + "px"; elt.style.minWidth = "1px";
|
388
|
+
return cm.addLineWidget(line, elt, {height: size, above: above});
|
389
|
+
}
|
390
|
+
|
391
|
+
function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
|
392
|
+
var flip = dv.type == "left";
|
393
|
+
var top = dv.orig.heightAtLine(chunk.origFrom, "local") - sTopOrig;
|
394
|
+
if (dv.svg) {
|
395
|
+
var topLpx = top;
|
396
|
+
var topRpx = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
|
397
|
+
if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
|
398
|
+
var botLpx = dv.orig.heightAtLine(chunk.origTo, "local") - sTopOrig;
|
399
|
+
var botRpx = dv.edit.heightAtLine(chunk.editTo, "local") - sTopEdit;
|
400
|
+
if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
|
401
|
+
var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
|
402
|
+
var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
|
403
|
+
attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
|
404
|
+
"d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
|
405
|
+
"class", dv.classes.connect);
|
406
|
+
}
|
407
|
+
if (dv.copyButtons) {
|
408
|
+
var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
|
409
|
+
"CodeMirror-merge-copy"));
|
410
|
+
var editOriginals = dv.mv.options.allowEditingOriginals;
|
411
|
+
copy.title = editOriginals ? "Push to left" : "Revert chunk";
|
412
|
+
copy.chunk = chunk;
|
413
|
+
copy.style.top = top + "px";
|
414
|
+
|
415
|
+
if (editOriginals) {
|
416
|
+
var topReverse = dv.orig.heightAtLine(chunk.editFrom, "local") - sTopEdit;
|
417
|
+
var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
|
418
|
+
"CodeMirror-merge-copy-reverse"));
|
419
|
+
copyReverse.title = "Push to right";
|
420
|
+
copyReverse.chunk = {editFrom: chunk.origFrom, editTo: chunk.origTo,
|
421
|
+
origFrom: chunk.editFrom, origTo: chunk.editTo};
|
422
|
+
copyReverse.style.top = topReverse + "px";
|
423
|
+
dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
|
424
|
+
}
|
425
|
+
}
|
426
|
+
}
|
427
|
+
|
428
|
+
function copyChunk(dv, to, from, chunk) {
|
429
|
+
if (dv.diffOutOfDate) return;
|
430
|
+
to.replaceRange(from.getRange(Pos(chunk.origFrom, 0), Pos(chunk.origTo, 0)),
|
431
|
+
Pos(chunk.editFrom, 0), Pos(chunk.editTo, 0));
|
432
|
+
}
|
433
|
+
|
434
|
+
// Merge view, containing 0, 1, or 2 diff views.
|
435
|
+
|
436
|
+
var MergeView = CodeMirror.MergeView = function(node, options) {
|
437
|
+
if (!(this instanceof MergeView)) return new MergeView(node, options);
|
438
|
+
|
439
|
+
this.options = options;
|
440
|
+
var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
|
441
|
+
|
442
|
+
var hasLeft = origLeft != null, hasRight = origRight != null;
|
443
|
+
var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
|
444
|
+
var wrap = [], left = this.left = null, right = this.right = null;
|
445
|
+
var self = this;
|
446
|
+
|
447
|
+
if (hasLeft) {
|
448
|
+
left = this.left = new DiffView(this, "left");
|
449
|
+
var leftPane = elt("div", null, "CodeMirror-merge-pane");
|
450
|
+
wrap.push(leftPane);
|
451
|
+
wrap.push(buildGap(left));
|
452
|
+
}
|
453
|
+
|
454
|
+
var editPane = elt("div", null, "CodeMirror-merge-pane");
|
455
|
+
wrap.push(editPane);
|
456
|
+
|
457
|
+
if (hasRight) {
|
458
|
+
right = this.right = new DiffView(this, "right");
|
459
|
+
wrap.push(buildGap(right));
|
460
|
+
var rightPane = elt("div", null, "CodeMirror-merge-pane");
|
461
|
+
wrap.push(rightPane);
|
462
|
+
}
|
463
|
+
|
464
|
+
(hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
|
465
|
+
|
466
|
+
wrap.push(elt("div", null, null, "height: 0; clear: both;"));
|
467
|
+
|
468
|
+
var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
|
469
|
+
this.edit = CodeMirror(editPane, copyObj(options));
|
470
|
+
|
471
|
+
if (left) left.init(leftPane, origLeft, options);
|
472
|
+
if (right) right.init(rightPane, origRight, options);
|
473
|
+
|
474
|
+
if (options.collapseIdentical) {
|
475
|
+
updating = true;
|
476
|
+
this.editor().operation(function() {
|
477
|
+
collapseIdenticalStretches(self, options.collapseIdentical);
|
478
|
+
});
|
479
|
+
updating = false;
|
480
|
+
}
|
481
|
+
if (options.connect == "align") {
|
482
|
+
this.aligners = [];
|
483
|
+
alignChunks(this.left || this.right, true);
|
484
|
+
}
|
485
|
+
|
486
|
+
var onResize = function() {
|
487
|
+
if (left) makeConnections(left);
|
488
|
+
if (right) makeConnections(right);
|
489
|
+
};
|
490
|
+
CodeMirror.on(window, "resize", onResize);
|
491
|
+
var resizeInterval = setInterval(function() {
|
492
|
+
for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
|
493
|
+
if (!p) { clearInterval(resizeInterval); CodeMirror.off(window, "resize", onResize); }
|
494
|
+
}, 5000);
|
495
|
+
};
|
496
|
+
|
497
|
+
function buildGap(dv) {
|
498
|
+
var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
|
499
|
+
lock.title = "Toggle locked scrolling";
|
500
|
+
var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
|
501
|
+
CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
|
502
|
+
var gapElts = [lockWrap];
|
503
|
+
if (dv.mv.options.revertButtons !== false) {
|
504
|
+
dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
|
505
|
+
CodeMirror.on(dv.copyButtons, "click", function(e) {
|
506
|
+
var node = e.target || e.srcElement;
|
507
|
+
if (!node.chunk) return;
|
508
|
+
if (node.className == "CodeMirror-merge-copy-reverse") {
|
509
|
+
copyChunk(dv, dv.orig, dv.edit, node.chunk);
|
510
|
+
return;
|
511
|
+
}
|
512
|
+
copyChunk(dv, dv.edit, dv.orig, node.chunk);
|
513
|
+
});
|
514
|
+
gapElts.unshift(dv.copyButtons);
|
515
|
+
}
|
516
|
+
if (dv.mv.options.connect != "align") {
|
517
|
+
var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
|
518
|
+
if (svg && !svg.createSVGRect) svg = null;
|
519
|
+
dv.svg = svg;
|
520
|
+
if (svg) gapElts.push(svg);
|
521
|
+
}
|
522
|
+
|
523
|
+
return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
|
524
|
+
}
|
525
|
+
|
526
|
+
MergeView.prototype = {
|
527
|
+
constuctor: MergeView,
|
528
|
+
editor: function() { return this.edit; },
|
529
|
+
rightOriginal: function() { return this.right && this.right.orig; },
|
530
|
+
leftOriginal: function() { return this.left && this.left.orig; },
|
531
|
+
setShowDifferences: function(val) {
|
532
|
+
if (this.right) this.right.setShowDifferences(val);
|
533
|
+
if (this.left) this.left.setShowDifferences(val);
|
534
|
+
},
|
535
|
+
rightChunks: function() {
|
536
|
+
if (this.right) { ensureDiff(this.right); return this.right.chunks; }
|
537
|
+
},
|
538
|
+
leftChunks: function() {
|
539
|
+
if (this.left) { ensureDiff(this.left); return this.left.chunks; }
|
540
|
+
}
|
541
|
+
};
|
542
|
+
|
543
|
+
function asString(obj) {
|
544
|
+
if (typeof obj == "string") return obj;
|
545
|
+
else return obj.getValue();
|
546
|
+
}
|
547
|
+
|
548
|
+
// Operations on diffs
|
549
|
+
|
550
|
+
var dmp = new diff_match_patch();
|
551
|
+
function getDiff(a, b) {
|
552
|
+
var diff = dmp.diff_main(a, b);
|
553
|
+
dmp.diff_cleanupSemantic(diff);
|
554
|
+
// The library sometimes leaves in empty parts, which confuse the algorithm
|
555
|
+
for (var i = 0; i < diff.length; ++i) {
|
556
|
+
var part = diff[i];
|
557
|
+
if (!part[1]) {
|
558
|
+
diff.splice(i--, 1);
|
559
|
+
} else if (i && diff[i - 1][0] == part[0]) {
|
560
|
+
diff.splice(i--, 1);
|
561
|
+
diff[i][1] += part[1];
|
562
|
+
}
|
563
|
+
}
|
564
|
+
return diff;
|
565
|
+
}
|
566
|
+
|
567
|
+
function getChunks(diff) {
|
568
|
+
var chunks = [];
|
569
|
+
var startEdit = 0, startOrig = 0;
|
570
|
+
var edit = Pos(0, 0), orig = Pos(0, 0);
|
571
|
+
for (var i = 0; i < diff.length; ++i) {
|
572
|
+
var part = diff[i], tp = part[0];
|
573
|
+
if (tp == DIFF_EQUAL) {
|
574
|
+
var startOff = startOfLineClean(diff, i) ? 0 : 1;
|
575
|
+
var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
|
576
|
+
moveOver(edit, part[1], null, orig);
|
577
|
+
var endOff = endOfLineClean(diff, i) ? 1 : 0;
|
578
|
+
var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
|
579
|
+
if (cleanToEdit > cleanFromEdit) {
|
580
|
+
if (i) chunks.push({origFrom: startOrig, origTo: cleanFromOrig,
|
581
|
+
editFrom: startEdit, editTo: cleanFromEdit});
|
582
|
+
startEdit = cleanToEdit; startOrig = cleanToOrig;
|
583
|
+
}
|
584
|
+
} else {
|
585
|
+
moveOver(tp == DIFF_INSERT ? edit : orig, part[1]);
|
586
|
+
}
|
587
|
+
}
|
588
|
+
if (startEdit <= edit.line || startOrig <= orig.line)
|
589
|
+
chunks.push({origFrom: startOrig, origTo: orig.line + 1,
|
590
|
+
editFrom: startEdit, editTo: edit.line + 1});
|
591
|
+
return chunks;
|
592
|
+
}
|
593
|
+
|
594
|
+
function endOfLineClean(diff, i) {
|
595
|
+
if (i == diff.length - 1) return true;
|
596
|
+
var next = diff[i + 1][1];
|
597
|
+
if (next.length == 1 || next.charCodeAt(0) != 10) return false;
|
598
|
+
if (i == diff.length - 2) return true;
|
599
|
+
next = diff[i + 2][1];
|
600
|
+
return next.length > 1 && next.charCodeAt(0) == 10;
|
601
|
+
}
|
602
|
+
|
603
|
+
function startOfLineClean(diff, i) {
|
604
|
+
if (i == 0) return true;
|
605
|
+
var last = diff[i - 1][1];
|
606
|
+
if (last.charCodeAt(last.length - 1) != 10) return false;
|
607
|
+
if (i == 1) return true;
|
608
|
+
last = diff[i - 2][1];
|
609
|
+
return last.charCodeAt(last.length - 1) == 10;
|
610
|
+
}
|
611
|
+
|
612
|
+
function chunkBoundariesAround(chunks, n, nInEdit) {
|
613
|
+
var beforeE, afterE, beforeO, afterO;
|
614
|
+
for (var i = 0; i < chunks.length; i++) {
|
615
|
+
var chunk = chunks[i];
|
616
|
+
var fromLocal = nInEdit ? chunk.editFrom : chunk.origFrom;
|
617
|
+
var toLocal = nInEdit ? chunk.editTo : chunk.origTo;
|
618
|
+
if (afterE == null) {
|
619
|
+
if (fromLocal > n) { afterE = chunk.editFrom; afterO = chunk.origFrom; }
|
620
|
+
else if (toLocal > n) { afterE = chunk.editTo; afterO = chunk.origTo; }
|
621
|
+
}
|
622
|
+
if (toLocal <= n) { beforeE = chunk.editTo; beforeO = chunk.origTo; }
|
623
|
+
else if (fromLocal <= n) { beforeE = chunk.editFrom; beforeO = chunk.origFrom; }
|
624
|
+
}
|
625
|
+
return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
|
626
|
+
}
|
627
|
+
|
628
|
+
function collapseSingle(cm, from, to) {
|
629
|
+
cm.addLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
|
630
|
+
var widget = document.createElement("span");
|
631
|
+
widget.className = "CodeMirror-merge-collapsed-widget";
|
632
|
+
widget.title = "Identical text collapsed. Click to expand.";
|
633
|
+
var mark = cm.markText(Pos(from, 0), Pos(to - 1), {
|
634
|
+
inclusiveLeft: true,
|
635
|
+
inclusiveRight: true,
|
636
|
+
replacedWith: widget,
|
637
|
+
clearOnEnter: true
|
638
|
+
});
|
639
|
+
function clear() {
|
640
|
+
mark.clear();
|
641
|
+
cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
|
642
|
+
}
|
643
|
+
widget.addEventListener("click", clear);
|
644
|
+
return {mark: mark, clear: clear};
|
645
|
+
}
|
646
|
+
|
647
|
+
function collapseStretch(size, editors) {
|
648
|
+
var marks = [];
|
649
|
+
function clear() {
|
650
|
+
for (var i = 0; i < marks.length; i++) marks[i].clear();
|
651
|
+
}
|
652
|
+
for (var i = 0; i < editors.length; i++) {
|
653
|
+
var editor = editors[i];
|
654
|
+
var mark = collapseSingle(editor.cm, editor.line, editor.line + size);
|
655
|
+
marks.push(mark);
|
656
|
+
mark.mark.on("clear", clear);
|
657
|
+
}
|
658
|
+
return marks[0].mark;
|
659
|
+
}
|
660
|
+
|
661
|
+
function unclearNearChunks(dv, margin, off, clear) {
|
662
|
+
for (var i = 0; i < dv.chunks.length; i++) {
|
663
|
+
var chunk = dv.chunks[i];
|
664
|
+
for (var l = chunk.editFrom - margin; l < chunk.editTo + margin; l++) {
|
665
|
+
var pos = l + off;
|
666
|
+
if (pos >= 0 && pos < clear.length) clear[pos] = false;
|
667
|
+
}
|
668
|
+
}
|
669
|
+
}
|
670
|
+
|
671
|
+
function collapseIdenticalStretches(mv, margin) {
|
672
|
+
if (typeof margin != "number") margin = 2;
|
673
|
+
var clear = [], edit = mv.editor(), off = edit.firstLine();
|
674
|
+
for (var l = off, e = edit.lastLine(); l <= e; l++) clear.push(true);
|
675
|
+
if (mv.left) unclearNearChunks(mv.left, margin, off, clear);
|
676
|
+
if (mv.right) unclearNearChunks(mv.right, margin, off, clear);
|
677
|
+
|
678
|
+
for (var i = 0; i < clear.length; i++) {
|
679
|
+
if (clear[i]) {
|
680
|
+
var line = i + off;
|
681
|
+
for (var size = 1; i < clear.length - 1 && clear[i + 1]; i++, size++) {}
|
682
|
+
if (size > margin) {
|
683
|
+
var editors = [{line: line, cm: edit}];
|
684
|
+
if (mv.left) editors.push({line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig});
|
685
|
+
if (mv.right) editors.push({line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig});
|
686
|
+
var mark = collapseStretch(size, editors);
|
687
|
+
if (mv.options.onCollapse) mv.options.onCollapse(mv, line, size, mark);
|
688
|
+
}
|
689
|
+
}
|
690
|
+
}
|
691
|
+
}
|
692
|
+
|
693
|
+
// General utilities
|
694
|
+
|
695
|
+
function elt(tag, content, className, style) {
|
696
|
+
var e = document.createElement(tag);
|
697
|
+
if (className) e.className = className;
|
698
|
+
if (style) e.style.cssText = style;
|
699
|
+
if (typeof content == "string") e.appendChild(document.createTextNode(content));
|
700
|
+
else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
|
701
|
+
return e;
|
702
|
+
}
|
703
|
+
|
704
|
+
function clear(node) {
|
705
|
+
for (var count = node.childNodes.length; count > 0; --count)
|
706
|
+
node.removeChild(node.firstChild);
|
707
|
+
}
|
708
|
+
|
709
|
+
function attrs(elt) {
|
710
|
+
for (var i = 1; i < arguments.length; i += 2)
|
711
|
+
elt.setAttribute(arguments[i], arguments[i+1]);
|
712
|
+
}
|
713
|
+
|
714
|
+
function copyObj(obj, target) {
|
715
|
+
if (!target) target = {};
|
716
|
+
for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
|
717
|
+
return target;
|
718
|
+
}
|
719
|
+
|
720
|
+
function moveOver(pos, str, copy, other) {
|
721
|
+
var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
|
722
|
+
for (;;) {
|
723
|
+
var nl = str.indexOf("\n", at);
|
724
|
+
if (nl == -1) break;
|
725
|
+
++out.line;
|
726
|
+
if (other) ++other.line;
|
727
|
+
at = nl + 1;
|
728
|
+
}
|
729
|
+
out.ch = (at ? 0 : out.ch) + (str.length - at);
|
730
|
+
if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
|
731
|
+
return out;
|
732
|
+
}
|
733
|
+
|
734
|
+
function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
|
735
|
+
function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
|
736
|
+
function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
|
737
|
+
|
738
|
+
function findPrevDiff(chunks, start, isOrig) {
|
739
|
+
for (var i = chunks.length - 1; i >= 0; i--) {
|
740
|
+
var chunk = chunks[i];
|
741
|
+
var to = (isOrig ? chunk.origTo : chunk.editTo) - 1;
|
742
|
+
if (to < start) return to;
|
743
|
+
}
|
744
|
+
}
|
745
|
+
|
746
|
+
function findNextDiff(chunks, start, isOrig) {
|
747
|
+
for (var i = 0; i < chunks.length; i++) {
|
748
|
+
var chunk = chunks[i];
|
749
|
+
var from = (isOrig ? chunk.origFrom : chunk.editFrom);
|
750
|
+
if (from > start) return from;
|
751
|
+
}
|
752
|
+
}
|
753
|
+
|
754
|
+
function goNearbyDiff(cm, dir) {
|
755
|
+
var found = null, views = cm.state.diffViews, line = cm.getCursor().line;
|
756
|
+
if (views) for (var i = 0; i < views.length; i++) {
|
757
|
+
var dv = views[i], isOrig = cm == dv.orig;
|
758
|
+
ensureDiff(dv);
|
759
|
+
var pos = dir < 0 ? findPrevDiff(dv.chunks, line, isOrig) : findNextDiff(dv.chunks, line, isOrig);
|
760
|
+
if (pos != null && (found == null || (dir < 0 ? pos > found : pos < found)))
|
761
|
+
found = pos;
|
762
|
+
}
|
763
|
+
if (found != null)
|
764
|
+
cm.setCursor(found, 0);
|
765
|
+
else
|
766
|
+
return CodeMirror.Pass;
|
767
|
+
}
|
768
|
+
|
769
|
+
CodeMirror.commands.goNextDiff = function(cm) {
|
770
|
+
return goNearbyDiff(cm, 1);
|
771
|
+
};
|
772
|
+
CodeMirror.commands.goPrevDiff = function(cm) {
|
773
|
+
return goNearbyDiff(cm, -1);
|
774
|
+
};
|
775
|
+
});
|