Skip to content

Commit

Permalink
Merge branches
Browse files Browse the repository at this point in the history
  • Loading branch information
@dimasites
dimasites committed Apr 22, 2023
2 parents 0caac6e + 7828bb5 commit 9653cd7
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 37 deletions.
13 changes: 0 additions & 13 deletions _build/build.config.sample.php
View file

This file was deleted.

26 changes: 26 additions & 0 deletions _build/ckeditor/build.config.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
/* define version */
define('PKG_NAME','CKEditor');
define('PKG_NAME_LOWER', strtolower(PKG_NAME));

define('PKG_NAMESPACE','ckeditor');
define('PKG_VERSION','1.4.4');
define('PKG_RELEASE','pl');
if (isset($_SERVER['MODX_BASE_PATH'])) {
define('MODX_BASE_PATH', $_SERVER['MODX_BASE_PATH']);
} elseif (file_exists(dirname(__FILE__ ,3) . '/core')) {
define('MODX_BASE_PATH', dirname(__FILE__,3) . '/');
} else {
define('MODX_BASE_PATH', dirname(__FILE__,4) . '/');
}
define('MODX_CORE_PATH', MODX_BASE_PATH . 'core/');
define('MODX_MANAGER_PATH', MODX_BASE_PATH . 'manager/');
define('MODX_CONNECTORS_PATH', MODX_BASE_PATH . 'connectors/');
define('MODX_ASSETS_PATH', MODX_BASE_PATH . 'assets/');

// define urls
define('MODX_BASE_URL', '/');
define('MODX_CORE_URL', MODX_BASE_URL . 'core/');
define('MODX_MANAGER_URL', MODX_BASE_URL . 'manager/');
define('MODX_CONNECTORS_URL', MODX_BASE_URL . 'connectors/');
define('MODX_ASSETS_URL', MODX_BASE_URL . 'assets/');
13 changes: 7 additions & 6 deletions _build/build.transport.php → _build/ckeditor/build.transport.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
define('PKG_VERSION','1.4.5');
define('PKG_RELEASE','pl');

require_once dirname(__FILE__) . '/build.config.php';
/* define sources */
$root = dirname(dirname(__FILE__)).'/';
$root = dirname(__FILE__,3).'/';
$sources = array(
'root' => $root,
'build' => $root . '_build/',
'data' => $root . '_build/data/',
'build' => $root . '_build/'. PKG_NAME_LOWER .'/',
'data' => $root . '_build/'. PKG_NAME_LOWER .'/data/',
'processors' => $root . 'core/model/modx/processors/resource/',
'lexicon' => $root . 'core/components/'.PKG_NAMESPACE.'/lexicon/',
'documents' => $root.'core/components/'.PKG_NAMESPACE.'/documents/',
Expand All @@ -31,8 +32,8 @@
unset($root);

/* load modx */
require_once dirname(__FILE__) . '/build.config.php';
require_once MODX_CORE_PATH . 'model/modx/modx.class.php';

$modx= new modX();
$modx->initialize('mgr');
$modx->setLogLevel(modX::LOG_LEVEL_INFO);
Expand All @@ -47,7 +48,7 @@
$plugin= $modx->newObject('modPlugin');
$plugin->set('id',1);
$plugin->set('name', PKG_NAME);
$plugin->set('description', 'CKEditor WYSIWYG editor plugin for MODx Revolution');
$plugin->set('description', 'CKEditor WYSIWYG editor plugin for MODX2 and MODX3');
$plugin->set('static', true);
$plugin->set('static_file', PKG_NAMESPACE.'/elements/plugins/'.PKG_NAMESPACE.'.plugin.php');
$plugin->set('category', 0);
Expand Down Expand Up @@ -110,7 +111,7 @@
$builder->putVehicle($vehicle);

/* load system settings */
$settings = include $sources['data'].'transport.settings.php';
$settings = include $sources['data'].'transport.settings_install.php';
if (is_array($settings) && !empty($settings)) {
$attributes= array(
xPDOTransport::UNIQUE_KEY => 'key',
Expand Down
0 _build/data/transport.plugin.events.php → ...ckeditor/data/transport.plugin.events.php
100755 → 100644
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions _build/data/transport.resolver.php → _build/ckeditor/data/transport.resolver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
*
* @author Danil Kostin <[email protected]>
*
* @package ace
* @package CKEditor
*/

/**
* Resolver to set which_editor to CKEditor
*
* @package ace
*
* @package CKEditor
* @subpackage build
*/
$success= true;
Expand All @@ -37,4 +37,4 @@
}
}

return $success;
return $success;
28 changes: 14 additions & 14 deletions _build/data/transport.settings.php → _build/ckeditor/data/transport.settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'key' => 'ckeditor.ui_color',
'xtype' => 'textfield',
'value' => '#DDDDDD',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -15,7 +15,7 @@
'key' => 'ckeditor.toolbar',
'xtype' => 'textarea',
'value' => '',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -24,7 +24,7 @@
'key' => 'ckeditor.toolbar_groups',
'xtype' => 'textarea',
'value' => '[{"name":"document","groups":["mode","document","doctools"]},{"name":"clipboard","groups":["clipboard","undo"]},{"name":"editing","groups":["find","selection","spellchecker"]},{"name":"links"},{"name":"insert"},{"name":"forms"},"/",{"name":"basicstyles","groups":["basicstyles","cleanup"]},{"name":"paragraph","groups":["list","indent","blocks","align","bidi"]},{"name":"styles"},{"name":"colors"},{"name":"tools"},{"name":"others"},{"name":"about"}]',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -33,7 +33,7 @@
'key' => 'ckeditor.format_tags',
'xtype' => 'textfield',
'value' => 'p;h1;h2;h3;h4;h5;h6;pre;address;div',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -42,7 +42,7 @@
'key' => 'ckeditor.skin',
'xtype' => 'textfield',
'value' => 'moono-lisa',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -51,7 +51,7 @@
'key' => 'ckeditor.extra_plugins',
'xtype' => 'textfield',
'value' => '',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -60,7 +60,7 @@
'key' => 'ckeditor.object_resizing',
'xtype' => 'combo-boolean',
'value' => '0',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -69,7 +69,7 @@
'key' => 'ckeditor.autocorrect_dash',
'xtype' => 'textfield',
'value' => '—',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -78,7 +78,7 @@
'key' => 'ckeditor.autocorrect_double_quotes',
'xtype' => 'textfield',
'value' => '«»',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -87,7 +87,7 @@
'key' => 'ckeditor.autocorrect_single_quotes',
'xtype' => 'textfield',
'value' => '„“',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -96,7 +96,7 @@
'key' => 'ckeditor.styles_set',
'xtype' => 'textarea',
'value' => 'default',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -105,7 +105,7 @@
'key' => 'ckeditor.remove_plugins',
'xtype' => 'textfield',
'value' => 'forms,smiley,autogrow,liststyle,justify,pagebreak,colorbutton,indentblock,font,newpage,print,save,language,bidi,selectall,preview',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -114,7 +114,7 @@
'key' => 'ckeditor.native_spellchecker',
'xtype' => 'combo-boolean',
'value' => '1',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand All @@ -123,7 +123,7 @@
'key' => 'ckeditor.resource_editor_height',
'xtype' => 'textfield',
'value' => '600',
'namespace' => 'ckeditor',
'namespace' => PKG_NAME_LOWER,
'area' => 'general'
),'',true,true);

Expand Down

0 comments on commit 9653cd7

Please sign in to comment.