upstream/kallithea Files · rhodecode/public/js/mode/diff/index.html

Add javascript for Object Code excanvas (flot) version herein included and use that instead of minified version....

Add javascript for Object Code excanvas (flot) version herein included and use that instead of minified version. I had a bit of trouble finding the upstream on excanvas, as the version from Google, which appears to be the original source, seems unmaintained. However, it appears the version we're carrying in Kallithea is indeed from the excanvas era of flot. $ (cd /tmp; \ svn -r 135 checkout http://flot.googlecode.com/svn/trunk/ flot ) $ cp /tmp/flot/excanvas.js rhodecode/public/js/excanvas.js I also verified the sha256sum of the min file matched ours: $ sha256sum /tmp/flot/excanvas.min.js rhodecode/public/js/excanvas.min.js 5f94b032a110504b7b261eaf71392fa3e8d82cdc6455c0cba5c9f03cd34ed122 /tmp/flot/excanvas.min.js 5f94b032a110504b7b261eaf71392fa3e8d82cdc6455c0cba5c9f03cd34ed122 rhodecode/public/js/excanvas.min.js

marcink - - Load All Authors

File last commit:

r4029:c9bcfe2d default


                r4132:531ab818

rhodecode-2.2.5-gpl

Download file

             index.html
        
                    105 lines
            
             | 4.0 KiB
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / public / js / mode / diff / index.html
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
      <!doctype html>

      <html>

        <head>

          <meta charset="utf-8">

          <title>CodeMirror: Diff mode</title>

          <link rel="stylesheet" href="../../lib/codemirror.css">

          <script src="../../lib/codemirror.js"></script>

          <script src="diff.js"></script>

          <style>

            .CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}

            span.cm-meta {color: #a0b !important;}

            span.cm-error { background-color: black; opacity: 0.4;}

            span.cm-error.cm-string { background-color: red; }

            span.cm-error.cm-tag { background-color: #2b2; }

          </style>

          <link rel="stylesheet" href="../../doc/docs.css">

        </head>

        <body>

          <h1>CodeMirror: Diff mode</h1>

          <form><textarea id="code" name="code">

      diff --git a/index.html b/index.html

      index c1d9156..7764744 100644

      --- a/index.html

      +++ b/index.html

      @@ -95,7 +95,8 @@ StringStream.prototype = {

           <script>

             var editor = CodeMirror.fromTextArea(document.getElementById("code"), {

               lineNumbers: true,

      -        autoMatchBrackets: true

      +        autoMatchBrackets: true,

      +      onGutterClick: function(x){console.log(x);}

             });

           </script>

         </body>

      diff --git a/lib/codemirror.js b/lib/codemirror.js

      index 04646a9..9a39cc7 100644

      --- a/lib/codemirror.js

      +++ b/lib/codemirror.js

      @@ -399,10 +399,16 @@ var CodeMirror = (function() {

           }

        marcink
    
codecleaner

              r4029
            
        marcink
    
added codemirror edit mode with autodetection

              r4026
            
           function onMouseDown(e) {

        marcink
    
codecleaner

              r4029
            
      -      var start = posFromMouse(e), last = start;

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
      +      var start = posFromMouse(e), last = start, target = e.target();

             if (!start) return;

             setCursor(start.line, start.ch, false);

             if (e.button() != 1) return;

        marcink
    
codecleaner

              r4029
            
      +      if (target.parentNode == gutter) {

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
      +        if (options.onGutterClick)

      +          options.onGutterClick(indexOf(gutter.childNodes, target) + showingFrom);

      +        return;

      +      }

      +

             if (!focused) onFocus();

        marcink
    
codecleaner

              r4029
            
        marcink
    
added codemirror edit mode with autodetection

              r4026
            
             e.stop();

      @@ -808,7 +814,7 @@ var CodeMirror = (function() {

             for (var i = showingFrom; i < showingTo; ++i) {

               var marker = lines[i].gutterMarker;

               if (marker) html.push('<div class="' + marker.style + '">' + htmlEscape(marker.text) + '</div>');

      -        else html.push("<div>" + (options.lineNumbers ? i + 1 : "\u00a0") + "</div>");

      +        else html.push("<div>" + (options.lineNumbers ? i + options.firstLineNumber : "\u00a0") + "</div>");

             }

             gutter.style.display = "none"; // TODO test whether this actually helps

             gutter.innerHTML = html.join("");

      @@ -1371,10 +1377,8 @@ var CodeMirror = (function() {

               if (option == "parser") setParser(value);

               else if (option === "lineNumbers") setLineNumbers(value);

               else if (option === "gutter") setGutter(value);

      -        else if (option === "readOnly") options.readOnly = value;

      -        else if (option === "indentUnit") {options.indentUnit = indentUnit = value; setParser(options.parser);}

      -        else if (/^(?:enterMode|tabMode|indentWithTabs|readOnly|autoMatchBrackets|undoDepth)$/.test(option)) options[option] = value;

      -        else throw new Error("Can't set option " + option);

      +        else if (option === "indentUnit") {options.indentUnit = value; setParser(options.parser);}

      +        else options[option] = value;

             },

             cursorCoords: cursorCoords,

             undo: operation(undo),

      @@ -1402,7 +1406,8 @@ var CodeMirror = (function() {

             replaceRange: operation(replaceRange),

        marcink
    
codecleaner

              r4029
            
        marcink
    
added codemirror edit mode with autodetection

              r4026
            
             operation: function(f){return operation(f)();},

      -      refresh: function(){updateDisplay([{from: 0, to: lines.length}]);}

      +      refresh: function(){updateDisplay([{from: 0, to: lines.length}]);},

      +      getInputField: function(){return input;}

           };

           return instance;

         }

      @@ -1420,6 +1425,7 @@ var CodeMirror = (function() {

           readOnly: false,

           onChange: null,

           onCursorActivity: null,

      +    onGutterClick: null,

           autoMatchBrackets: false,

           workTime: 200,

           workDelay: 300,

      </textarea></form>

          <script>

            var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});

          </script>

          <p><strong>MIME types defined:</strong> <code>text/x-diff</code>.</p>

        </body>

      </html>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

marcink added codemirror edit mode with autodetection	r4026	<!doctype html>
		<html>
		<head>
		<meta charset="utf-8">
		<title>CodeMirror: Diff mode</title>
		<link rel="stylesheet" href="../../lib/codemirror.css">
		<script src="../../lib/codemirror.js"></script>
		<script src="diff.js"></script>
		<style>
		.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}
		span.cm-meta {color: #a0b !important;}
		span.cm-error { background-color: black; opacity: 0.4;}
		span.cm-error.cm-string { background-color: red; }
		span.cm-error.cm-tag { background-color: #2b2; }
		</style>
		<link rel="stylesheet" href="../../doc/docs.css">
		</head>
		<body>
		<h1>CodeMirror: Diff mode</h1>
		<form><textarea id="code" name="code">
		diff --git a/index.html b/index.html
		index c1d9156..7764744 100644
		--- a/index.html
		+++ b/index.html
		@@ -95,7 +95,8 @@ StringStream.prototype = {
		<script>
		var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
		lineNumbers: true,
		- autoMatchBrackets: true
		+ autoMatchBrackets: true,
		+ onGutterClick: function(x){console.log(x);}
		});
		</script>
		</body>
		diff --git a/lib/codemirror.js b/lib/codemirror.js
		index 04646a9..9a39cc7 100644
		--- a/lib/codemirror.js
		+++ b/lib/codemirror.js
		@@ -399,10 +399,16 @@ var CodeMirror = (function() {
		}
marcink codecleaner	r4029
marcink added codemirror edit mode with autodetection	r4026	function onMouseDown(e) {
marcink codecleaner	r4029	- var start = posFromMouse(e), last = start;
marcink added codemirror edit mode with autodetection	r4026	+ var start = posFromMouse(e), last = start, target = e.target();
		if (!start) return;
		setCursor(start.line, start.ch, false);
		if (e.button() != 1) return;
marcink codecleaner	r4029	+ if (target.parentNode == gutter) {
marcink added codemirror edit mode with autodetection	r4026	+ if (options.onGutterClick)
		+ options.onGutterClick(indexOf(gutter.childNodes, target) + showingFrom);
		+ return;
		+ }
		+
		if (!focused) onFocus();
marcink codecleaner	r4029
marcink added codemirror edit mode with autodetection	r4026	e.stop();
		@@ -808,7 +814,7 @@ var CodeMirror = (function() {
		for (var i = showingFrom; i < showingTo; ++i) {
		var marker = lines[i].gutterMarker;
		if (marker) html.push('<div class="' + marker.style + '">' + htmlEscape(marker.text) + '</div>');
		- else html.push("<div>" + (options.lineNumbers ? i + 1 : "\u00a0") + "</div>");
		+ else html.push("<div>" + (options.lineNumbers ? i + options.firstLineNumber : "\u00a0") + "</div>");
		}
		gutter.style.display = "none"; // TODO test whether this actually helps
		gutter.innerHTML = html.join("");
		@@ -1371,10 +1377,8 @@ var CodeMirror = (function() {
		if (option == "parser") setParser(value);
		else if (option === "lineNumbers") setLineNumbers(value);
		else if (option === "gutter") setGutter(value);
		- else if (option === "readOnly") options.readOnly = value;
		- else if (option === "indentUnit") {options.indentUnit = indentUnit = value; setParser(options.parser);}
		- else if (/^(?:enterMode\|tabMode\|indentWithTabs\|readOnly\|autoMatchBrackets\|undoDepth)$/.test(option)) options[option] = value;
		- else throw new Error("Can't set option " + option);
		+ else if (option === "indentUnit") {options.indentUnit = value; setParser(options.parser);}
		+ else options[option] = value;
		},
		cursorCoords: cursorCoords,
		undo: operation(undo),
		@@ -1402,7 +1406,8 @@ var CodeMirror = (function() {
		replaceRange: operation(replaceRange),
marcink codecleaner	r4029
marcink added codemirror edit mode with autodetection	r4026	operation: function(f){return operation(f)();},
		- refresh: function(){updateDisplay([{from: 0, to: lines.length}]);}
		+ refresh: function(){updateDisplay([{from: 0, to: lines.length}]);},
		+ getInputField: function(){return input;}
		};
		return instance;
		}
		@@ -1420,6 +1425,7 @@ var CodeMirror = (function() {
		readOnly: false,
		onChange: null,
		onCursorActivity: null,
		+ onGutterClick: null,
		autoMatchBrackets: false,
		workTime: 200,
		workDelay: 300,
		</textarea></form>
		<script>
		var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
		</script>

		<p><strong>MIME types defined:</strong> <code>text/x-diff</code>.</p>

		</body>
		</html>