lxm_front/Mergely
1
0
Fork 1
mirror of synced 2025-12-08 23:08:11 +08:00
Code Issues Projects Releases Wiki Activity

Added 'debug' option to editor to make it easier to switch.

Browse Source
This commit is contained in:
Jamie Peabody
2014-08-17 12:11:03 +01:00
parent 8b3859de40
commit 456da5f2c8
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
editor/editor.php
View File

@@ -1,5 +1,6 @@
<?php <?php
$key = ''; $key = '';
$debug = False;
if (isset($_GET['key'])) { if (isset($_GET['key'])) {
$key = $_GET['key']; $key = $_GET['key'];
} }
@@ -25,17 +26,21 @@ if (isset($_GET['key'])) {
<script type="text/javascript" src="/Mergely/editor/lib/tipsy/jquery.tipsy.js"></script> <script type="text/javascript" src="/Mergely/editor/lib/tipsy/jquery.tipsy.js"></script>
<script type="text/javascript" src="/Mergely/editor/lib/farbtastic/farbtastic.js"></script> <script type="text/javascript" src="/Mergely/editor/lib/farbtastic/farbtastic.js"></script>
<link type="text/css" rel="stylesheet" href="/Mergely/editor/lib/farbtastic/farbtastic.css" /> <link type="text/css" rel="stylesheet" href="/Mergely/editor/lib/farbtastic/farbtastic.css" />
<?php
<!-- if ($debug) {
?>
<script type="text/javascript" src="/Mergely/editor/editor.js"></script> <script type="text/javascript" src="/Mergely/editor/editor.js"></script>
--> <script type="text/javascript" src="/Mergely/lib/mergely.js"></script>
<script type="text/javascript" src="/Mergely/editor/editor.min.js"></script> <?php
}
else {
?>
<script type="text/javascript" src="/Mergely/editor/editor.min.js"></script>
<script type="text/javascript" src="/Mergely/lib/mergely.min.js"></script>
<?php
}
?>
<link type='text/css' rel='stylesheet' href='/Mergely/editor/editor.css' /> <link type='text/css' rel='stylesheet' href='/Mergely/editor/editor.css' />
<script type="text/javascript" src="/Mergely/lib/mergely.min.js"></script>
<!--
<script type="text/javascript" src="/Mergely/lib/mergely.js"></script>
-->
<link type="text/css" rel="stylesheet" href="/Mergely/lib/mergely.css" /> <link type="text/css" rel="stylesheet" href="/Mergely/lib/mergely.css" />
<script type="text/javascript" src="/Mergely/lib/codemirror.min.js"></script> <script type="text/javascript" src="/Mergely/lib/codemirror.min.js"></script>
<script type="text/javascript" src="/Mergely/lib/searchcursor.js"></script> <script type="text/javascript" src="/Mergely/lib/searchcursor.js"></script>

3
lib/mergely.js
View File

@@ -396,7 +396,6 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
lhs: function(setValue) { }, lhs: function(setValue) { },
rhs: function(setValue) { }, rhs: function(setValue) { },
loaded: function() { }, loaded: function() { },
//_auto_height: function(h) { return h - 20; },
_auto_width: function(w) { return w; }, _auto_width: function(w) { return w; },
resize: function(init) { resize: function(init) {
var scrollbar = init ? 16 : 0; var scrollbar = init ? 16 : 0;
@@ -635,6 +634,8 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
if (this.settings.autoresize) { if (this.settings.autoresize) {
cmstyle += this.id + ' .CodeMirror-scroll { height: 100%; overflow: auto; }'; cmstyle += this.id + ' .CodeMirror-scroll { height: 100%; overflow: auto; }';
} }
// adjust the margin line height
cmstyle += '\n.CodeMirror { line-height: 18px; }';
jQuery('<style type="text/css">' + cmstyle + '</style>').appendTo('head'); jQuery('<style type="text/css">' + cmstyle + '</style>').appendTo('head');
//bind //bind

2
lib/mergely.min.js vendored
View File

File diff suppressed because one or more lines are too long