blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 07:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- beautified composer.json

Browse Source 
- added borgar/textile-js to composer requirements (composer.json)
- removed textile.min.js from include directory
- replaced old textile js path with the new one in header.php
- changed the call of js textile in application/views/system/phraseinhaltEdit.php
This commit is contained in:
Paolo
2017-08-25 11:27:41 +02:00
parent d1fa93a2b6
commit 921bdd1242
4 changed files with 117 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/phraseinhaltEdit.php
+2 -2
View File
@@ -91,12 +91,12 @@ function initTextile() {
// use a simple timer to check if the textarea content has changed
var value = $content.val();
$preview.html(textile.convert(value));
$preview.html(textile.parse(value));
setInterval(function () {
var newValue = $content.val();
if (value != newValue) {
value = newValue;
$preview.html(textile.convert(newValue)); // convert the textile to html
$preview.html(textile.parse(newValue)); // convert the textile to html
}
}, 500);
};
application/views/templates/header.php
+3 -3
View File
@@ -28,7 +28,7 @@ if($jqueryui)
$jqueryComposer = true;
if($jquery && $jqueryComposer)
show_error("Two JQuery versions used: composer and includefolderversion");
show_error("Two JQuery versions used: composer and include folder version");
?>
<!DOCTYPE HTML>
@@ -93,7 +93,7 @@ if($jquery && $jqueryComposer)
<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce/tinymce.min.js');?>"></script>
<?php endif ?>
<?php if($textile) : ?>
<script type="text/javascript" src="<?php echo base_url('include/js/textile.min.js');?>"></script>
<script type="text/javascript" src="<?php echo base_url('vendor/borgar/textile-js/lib/textile.min.js');?>"></script>
<?php endif ?>
<?php if($jsoneditor) : ?>
<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/jsoneditor/dist/jsoneditor.css');?>" />
@@ -106,4 +106,4 @@ if($jquery && $jqueryComposer)
<?php if($widgetsCSS) : ?>
<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/widgets.css'); ?>" />
<?php endif ?>
</head>
</head>
composer.json
+112 -104
View File
@@ -1,113 +1,121 @@
{
"name": "fh-complete/fhc-core",
"type": "app",
"description": "FH-Complete Core",
"keywords": ["fhc", "fh-complete", "campusmanagement"],
"homepage": "https://github.com/FH-Complete/FHC-Core",
"license": "GPLv3",
"authors": [
{
"name": "Christian Paminger",
"email": "christian.paminger@fhcomplete.org",
"homepage": "http://fhcomplete.org"
},
{
"name": "Andreas Österreicher",
"email": "oesi@technikum-wien.at",
"homepage": "http://fhcomplete.org"
}],
"support":
{
"email": "info@fhcomplete.org",
"forum": "https://plus.google.com/communities/113278802529782592610",
"wiki": "http://wiki.fhcomplete.org/"
},
"repositories": [
{
"type": "package",
"package":
{
"name": "codeigniter-restserver",
"version": "2.6",
"dist":
{
"url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip",
"type": "zip"
}
"name": "fh-complete/fhc-core",
"type": "app",
"description": "FH-Complete Core",
"keywords": [
"fhc",
"fh-complete",
"campusmanagement"
],
"homepage": "https://github.com/FH-Complete/FHC-Core",
"license": "GPLv3",
"authors": [
{
"name": "Christian Paminger",
"email": "christian.paminger@fhcomplete.org",
"homepage": "http://fhcomplete.org"
},
{
"name": "Andreas Österreicher",
"email": "oesi@technikum-wien.at",
"homepage": "http://fhcomplete.org"
}
],
"support": {
"email": "info@fhcomplete.org",
"forum": "https://plus.google.com/communities/113278802529782592610",
"wiki": "http://wiki.fhcomplete.org/"
},
{
"type": "package",
"package":
{
"name": "jsoneditor",
"version": "5.5.6",
"dist":
{
"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
"type": "zip"
"repositories": [
{
"type": "package",
"package": {
"name": "codeigniter-restserver",
"version": "2.6",
"dist": {
"url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip",
"type": "zip"
}
}
},
{
"type": "package",
"package": {
"name": "jsoneditor",
"version": "5.5.6",
"dist": {
"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
"type": "zip"
}
}
},
{
"type": "package",
"package": {
"name": "json-forms",
"version": "1.4.0",
"dist": {
"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
"type": "zip"
}
}
},
{
"type": "package",
"package": {
"name": "borgar/textile-js",
"version": "1.0",
"source": {
"url": "https://github.com/borgar/textile-js.git",
"type": "git",
"reference": "master"
}
}
}
],
"require": {
"php": ">=5.4.0",
"codeigniter/framework": "3.*",
"codeigniter-restserver": "2.6",
"jsoneditor": "5.5.6",
"kingsquare/json-schema-form": "*",
"easyrdf/easyrdf": "0.9.*",
"ml/json-ld": "1.*",
"rougin/combustor": "1.1.*",
"rougin/refinery": "*",
"components/jquery": "2.1.4",
"components/jqueryui": "1.12.*",
"components/angular.js": "1.3.16",
"components/bootstrap": "3.3.5",
"michelf/php-markdown": "1.5.0",
"tinymce/tinymce": "4.*",
"zetacomponents/workflow": "1.*",
"zetacomponents/document": "1.*",
"zetacomponents/workflow-database-tiein": "1.*",
"zetacomponents/workflow-event-log-tiein": "1.*",
"json-forms": "1.4.0",
"wikimedia/composer-merge-plugin": "^1.3",
"fzaninotto/faker": "1.*",
"netcarver/textile": "^3.5",
"netcarver/textile": "^3.5",
"borgar/textile-js": "1.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "2.*"
},
"config": {
"bin-dir": "bin"
},
{
"type": "package",
"package":
{
"name": "json-forms",
"version": "1.4.0",
"dist":
{
"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
"type": "zip"
}
}
}
],
"require":
{
"php": ">=5.4.0",
"codeigniter/framework":"3.*",
"codeigniter-restserver": "2.6",
"jsoneditor": "5.5.6",
"kingsquare/json-schema-form": "*",
"easyrdf/easyrdf": "0.9.*",
"ml/json-ld": "1.*",
"rougin/combustor": "1.1.*",
"rougin/refinery": "*",
"components/jquery": "2.1.4",
"components/jqueryui": "1.12.*",
"components/angular.js": "1.3.16",
"components/bootstrap": "3.3.5",
"michelf/php-markdown": "1.5.0",
"tinymce/tinymce": "4.*",
"zetacomponents/workflow": "1.*",
"zetacomponents/document": "1.*",
"zetacomponents/workflow-database-tiein": "1.*",
"zetacomponents/workflow-event-log-tiein": "1.*",
"json-forms": "1.4.0",
"wikimedia/composer-merge-plugin": "^1.3",
"fzaninotto/faker": "1.*",
"netcarver/textile": "^3.5"
},
"require-dev":
{
"squizlabs/php_codesniffer": "2.*"
},
"config":
{
"bin-dir": "bin"
},
"extra": {
"merge-plugin": {
"include": [
"composer.json",
"addons/*/composer.json"
],
"recurse": true,
"replace": false,
"merge-dev": false,
"merge-extra": false
}
"merge-plugin": {
"include": [
"composer.json",
"addons/*/composer.json"
],
"recurse": true,
"replace": false,
"merge-dev": false,
"merge-extra": false
}
}
}
include/js/textile.min.js
Vendored
-1
View File
File diff suppressed because one or more lines are too long