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

Merge branch 'development' into 'master'

Browse source 
Fixed find not focusing automatically, fixed updater showing error when there…

See merge request xevidos/codiad!18
This commit is contained in:
Isaac Brown 2018-12-12 11:10:40 -05:00
commit 5bf3c9bdcb
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/editor/dialog.php
View file

@ -53,6 +53,7 @@ switch($_GET['action']){
$(function(){ $(function(){
<?php if($_GET['action']=='search'){ ?> <?php if($_GET['action']=='search'){ ?>
$('textarea[name="find"]').val(codiad.active.getSelectedText()); $('textarea[name="find"]').val(codiad.active.getSelectedText());
$('textarea[name="find"]').focus();
<?php } ?> <?php } ?>
}); });

12
components/update/update.php
View file

@ -320,6 +320,13 @@ ALTER TABLE `user_options` MODIFY `id` INT(11) NOT NULL AUTO_INCREMENT;
$bind = "sss"; $bind = "sss";
$bind_variables = array( $data["name"], $data["path"], $owner ); $bind_variables = array( $data["name"], $data["path"], $owner );
$return = sql::sql( $sql, $bind, $bind_variables, formatJSEND( "error", "Error creating project $project." ) ); $return = sql::sql( $sql, $bind, $bind_variables, formatJSEND( "error", "Error creating project $project." ) );
if( sql::check_sql_error( $return ) ) {
} else {
$this->restore();
exit(formatJSEND( "error", "There was an error adding projects to database." ));
}
} }
unlink( $projects_file ); unlink( $projects_file );
} }
@ -345,10 +352,11 @@ ALTER TABLE `user_options` MODIFY `id` INT(11) NOT NULL AUTO_INCREMENT;
$this->username = $user["username"]; $this->username = $user["username"];
$this->set_default_options(); $this->set_default_options();
echo formatJSEND( "success", array( "username" => $user["username"] ) ); //echo formatJSEND( "success", array( "username" => $user["username"] ) );
} else { } else {
echo formatJSEND( "error", "The Username is Already Taken" ); $this->restore();
exit(formatJSEND( "error", "The Username is Already Taken" ));
} }
} }
unlink( $users_file ); unlink( $users_file );

3
components/user/dialog.php
View file

@ -35,7 +35,6 @@
<tr> <tr>
<th width="150"><?php i18n("Username"); ?></th> <th width="150"><?php i18n("Username"); ?></th>
<th width="85"><?php i18n("Password"); ?></th> <th width="85"><?php i18n("Password"); ?></th>
<th width="75"><?php i18n("Projects"); ?></th>
<th width="70"><?php i18n("Delete"); ?></th> <th width="70"><?php i18n("Delete"); ?></th>
</tr> </tr>
</table> </table>
@ -45,7 +44,7 @@
// Get projects JSON data // Get projects JSON data
$users = $User->list_users(); $users = $User->list_users();
foreach( $users as $user => $data ){ foreach( $users as $user => $data ) {
?> ?>
<tr> <tr>
<td width="150"><?php echo($data['username']); ?></td> <td width="150"><?php echo($data['username']); ?></td>