dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- New emoji support added, closed #849

Browse Source
This commit is contained in:
Mark Friedrich
2019-10-06 11:32:57 +02:00
parent 74cbbec328
commit 8251ce23b7
7 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/lib/config.php
View File

@@ -344,7 +344,7 @@ class Config extends \Prefab {
if($config['SCHEME'] == 'mysql'){
$options[\PDO::MYSQL_ATTR_COMPRESS] = true;
$options[\PDO::MYSQL_ATTR_INIT_COMMAND] = implode(',', [
"SET NAMES " . strtolower(str_replace('-','', $f3->ENCODING)),
"SET NAMES " . self::getRequiredDbVars($f3, $config['SCHEME'])['CHARACTER_SET_CONNECTION'] . " COLLATE " . self::getRequiredDbVars($f3, $config['SCHEME'])['COLLATION_CONNECTION'],
"@@session.time_zone = '+00:00'",
"@@session.default_storage_engine = " . self::getRequiredDbVars($f3, $config['SCHEME'])['DEFAULT_STORAGE_ENGINE']
]);

6
app/main/model/pathfinder/systemsignaturemodel.php
View File

@@ -13,8 +13,14 @@ use lib\logging;
class SystemSignatureModel extends AbstractMapTrackingModel {
/**
* @var string
*/
protected $table = 'system_signature';
/**
* @var array
*/
protected $fieldConf = [
'active' => [
'type' => Schema::DT_BOOL,

13
app/requirements.ini
View File

@@ -56,12 +56,13 @@ PDO_TIMEOUT = 2
; MySql variables. Values are auto. set as 'SESSION' vars
; https://dev.mysql.com/doc/refman/5.5/en/show-variables.html
DEFAULT_STORAGE_ENGINE = InnoDB
CHARACTER_SET_DATABASE = utf8
CHARACTER_SET_CLIENT = utf8
CHARACTER_SET_RESULTS = utf8
CHARACTER_SET_CONNECTION = utf8
COLLATION_DATABASE = utf8_general_ci
COLLATION_CONNECTION = utf8_general_ci
CHARACTER_SET_SERVER = utf8mb4
CHARACTER_SET_DATABASE = utf8mb4
CHARACTER_SET_CLIENT = utf8mb4
CHARACTER_SET_RESULTS = utf8mb4
CHARACTER_SET_CONNECTION = utf8mb4
COLLATION_DATABASE = utf8mb4_unicode_ci
COLLATION_CONNECTION = utf8mb4_unicode_ci
FOREIGN_KEY_CHECKS = ON
INNODB_FILE_PER_TABLE = ON
WAIT_TIMEOUT = 28800

9
js/app/ui/module/system_signature.js
View File

@@ -1571,14 +1571,15 @@ define([
value: cellData,
inputclass: config.fontUppercaseClass,
display: function(value){
// change display value to first 3 letters
$(this).text($.trim( value.substr(0, 3) ).toLowerCase());
// change display value to first 3 chars -> unicode beware
$(this).text([...$.trim(value)].slice(0, 3).join('').toLowerCase());
},
validate: function(value){
let msg = false;
if($.trim(value).length < 3){
let mbLength = [...$.trim(value)].length; // unicode beware
if(mbLength < 3){
msg = 'Id is less than min of "3"';
}else if($.trim(value).length > 10){
}else if(mbLength > 10){
msg = 'Id is more than max of "10"';
}

2
public/css/v1.5.4/pathfinder.css
View File

File diff suppressed because one or more lines are too long

9
public/js/v1.5.4/app/ui/module/system_signature.js
View File

@@ -1571,14 +1571,15 @@ define([
value: cellData,
inputclass: config.fontUppercaseClass,
display: function(value){
// change display value to first 3 letters
$(this).text($.trim( value.substr(0, 3) ).toLowerCase());
// change display value to first 3 chars -> unicode beware
$(this).text([...$.trim(value)].slice(0, 3).join('').toLowerCase());
},
validate: function(value){
let msg = false;
if($.trim(value).length < 3){
let mbLength = [...$.trim(value)].length; // unicode beware
if(mbLength < 3){
msg = 'Id is less than min of "3"';
}else if($.trim(value).length > 10){
}else if(mbLength > 10){
msg = 'Id is more than max of "10"';
}

2
sass/layout/_main.scss
View File

@@ -261,7 +261,7 @@ select:active, select:hover {
// <optgroup> options
.select2-results__options--nested{
.select2-results__option{
padding-left: 15px; // more padding for nested options
padding-left: 10px; // more padding for nested options
}
}