Mirror/codiad
1
0
Fork 0
mirror of https://github.com/xevidos/codiad.git synced 2024-12-22 22:02:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Removed some git artifacts

Browse source
This commit is contained in:
xevidos 2019-10-19 18:05:38 -04:00
parent c8c971b509
commit aad8c48a82
4 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/active/class.active.php
View file

@ -115,16 +115,12 @@ class Active extends Common {
public function Add() {
global $sql;
<<<<<<< HEAD
$query = "SELECT focused FROM active WHERE path=? AND user=? LIMIT 1;";
$bind_variables = array( $this->path, $_SESSION["user_id"] );
$result = $sql->query( $query, $bind_variables, array() );
if( count( $result ) == 0 ) {
=======
$query = "UPDATE active SET focused=false WHERE user=? AND path=?;";
$bind_variables = array( $_SESSION["user_id"], $this->path );
$result = $sql->query( $query, $bind_variables, 0, "rowCount" );
@ -132,7 +128,6 @@ class Active extends Common {
if( $result == 0 ) {
global $sql;
>>>>>>> 5af37cbce3326f97b4d3ff7eb50e88feb1fc8063
$query = "INSERT INTO active( user, path, focused ) VALUES ( ?, ?, ? );";
$bind_variables = array( $_SESSION["user_id"], $this->path, false );
$result = $sql->query( $query, $bind_variables, 0, "rowCount" );
@ -143,6 +138,7 @@ class Active extends Common {
}
}
}
}
//////////////////////////////////////////////////////////////////
// Rename File

4
components/editor/dialog.php
View file

@ -23,11 +23,7 @@ checkSession();
?>
<label><?php i18n("Goto Line:"); ?></label>
<<<<<<< HEAD
<input name="goto_line" type="number" autofocus="autofocus" autocomplete="off">
=======
<input name="goto_line" autofocus="autofocus" autocomplete="off">
>>>>>>> 5af37cbce3326f97b4d3ff7eb50e88feb1fc8063
<button class="btn-left" onclick="codiad.editor.goto_line();return false;"><?php i18n("Goto"); ?></button>
<button class="btn-right" onclick="codiad.modal.unload(); return false;"><?php i18n("Cancel"); ?></button>
<?php

4
components/editor/init.js
View file

@ -1329,7 +1329,6 @@
i.commands.addCommand( m );
});
<<<<<<< HEAD
},
open_goto: function() {
@ -1348,9 +1347,6 @@
let line = $( '#modal input[name="goto_line"]' ).val();
this.gotoLine( line );
codiad.modal.unload();
=======
>>>>>>> 5af37cbce3326f97b4d3ff7eb50e88feb1fc8063
},
//////////////////////////////////////////////////////////////////

3
components/keybindings/init.js
View file

@ -52,7 +52,6 @@
}
},
{
<<<<<<< HEAD
name: 'Goto Line',
bindKey: {
win: 'Ctrl-L',
@ -64,8 +63,6 @@
}
},
{
=======
>>>>>>> 5af37cbce3326f97b4d3ff7eb50e88feb1fc8063
name: 'Move Down',
bindKey: {
win: 'Ctrl-down',