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

Migrate to Mergely 3.3.4....

Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css

marcink - - Load All Authors

File last commit:

r4042:af3c746b default


                r4125:aa3b5594

rhodecode-2.2.5-gpl

Download file

             index.html
        
                    51 lines
            
             | 1.6 KiB
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / public / js / mode / php / 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: PHP mode</title>

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

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

          <script src="../../addon/edit/matchbrackets.js"></script>

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

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

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

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

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

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

          <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>

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

        </head>

        <body>

          <h1>CodeMirror: PHP mode</h1>

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

      <?php

      function hello($who) {

        marcink
    
codecleaner

              r4029
            
          return "Hello " . $who;

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
      }

      ?>

      <p>The program says <?= hello("World") ?>.</p>

      <script>

        marcink
    
codecleaner

              r4029
            
          alert("And here is some JS code"); // also colored

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
      </script>

      </textarea></form>

          <script>

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

              lineNumbers: true,

              matchBrackets: true,

              mode: "application/x-httpd-php",

              indentUnit: 4,

              indentWithTabs: true,

              enterMode: "keep",

              tabMode: "shift"

            });

          </script>

          <p>Simple HTML/PHP mode based on

        marcink
    
update codemirror to latest version

              r4042
            
          the <a href="../clike/">C-like</a> mode. Depends on XML,

        marcink
    
added codemirror edit mode with autodetection

              r4026
            
          JavaScript, CSS, HTMLMixed, and C-like modes.</p>

          <p><strong>MIME types defined:</strong> <code>application/x-httpd-php</code> (HTML with PHP code), <code>text/x-php</code> (plain, non-wrapped PHP 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: PHP mode</title>
		<link rel="stylesheet" href="../../lib/codemirror.css">
		<script src="../../lib/codemirror.js"></script>
		<script src="../../addon/edit/matchbrackets.js"></script>
		<script src="../htmlmixed/htmlmixed.js"></script>
		<script src="../xml/xml.js"></script>
		<script src="../javascript/javascript.js"></script>
		<script src="../css/css.js"></script>
		<script src="../clike/clike.js"></script>
		<script src="php.js"></script>
		<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
		<link rel="stylesheet" href="../../doc/docs.css">
		</head>
		<body>
		<h1>CodeMirror: PHP mode</h1>

		<form><textarea id="code" name="code">
		<?php
		function hello($who) {
marcink codecleaner	r4029	return "Hello " . $who;
marcink added codemirror edit mode with autodetection	r4026	}
		?>
		<p>The program says <?= hello("World") ?>.</p>
		<script>
marcink codecleaner	r4029	alert("And here is some JS code"); // also colored
marcink added codemirror edit mode with autodetection	r4026	</script>
		</textarea></form>

		<script>
		var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
		lineNumbers: true,
		matchBrackets: true,
		mode: "application/x-httpd-php",
		indentUnit: 4,
		indentWithTabs: true,
		enterMode: "keep",
		tabMode: "shift"
		});
		</script>

		<p>Simple HTML/PHP mode based on
marcink update codemirror to latest version	r4042	the <a href="../clike/">C-like</a> mode. Depends on XML,
marcink added codemirror edit mode with autodetection	r4026	JavaScript, CSS, HTMLMixed, and C-like modes.</p>

		<p><strong>MIME types defined:</strong> <code>application/x-httpd-php</code> (HTML with PHP code), <code>text/x-php</code> (plain, non-wrapped PHP code).</p>
		</body>
		</html>