Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance HtmlEditor #1203

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+1,980 −138
Open

Enhance HtmlEditor #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1882e3b
Update HtmlEditorImageInsert.js
polarismail Nov 15, 2024
d96411d
Create HtmlEditorTablePlugin.js
polarismail Nov 15, 2024
80181e7
Update scripts.txt
polarismail Nov 15, 2024
a332648
Update HtmlEditor.js
polarismail Nov 15, 2024
bee111b
Create HtmlEditorFontSelection.js
polarismail Nov 16, 2024
83a535b
Update scripts.txt
polarismail Nov 16, 2024
cb24876
Update HtmlEditor.js
polarismail Nov 16, 2024
c394b26
Update HtmlEditorTablePlugin.js
polarismail Nov 16, 2024
bdd346c
Update HtmlEditorFontSelection.js
polarismail Nov 16, 2024
7f4d6e5
Merge branch 'Intermesh:master' into master
polarismail Dec 20, 2024
7f88fc7
Update index.php
polarismail Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion www/go/modules/community/carddav/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,21 @@

/* Initializing server */
$server = new Server($nodes);

// Remove CalDAV properties because SabreDAV will still return them even though we want just CardDAV ones
$server->on('propFind', function($propFind, $node) {
$requestedProps = $propFind->getRequestedProperties();

// Filter out CalDAV properties
foreach($requestedProps as $prop) {
if (strpos($prop, 'urn:ietf:params:xml:ns:caldav') !== false) {
$propFind->set($prop, null, 404);
}
}

// Listen with high priority, before the others
},1000);

$server->debugExceptions = go()->getDebugger()->enabled;
$server->on('exception', function($e){
if(!($e instanceof NotAuthenticated) && !($e instanceof NotFound)) {
Expand Down Expand Up @@ -84,4 +99,4 @@
$server->addPlugin($browser);

// And off we go!
$server->exec();
$server->exec();
4 changes: 4 additions & 0 deletions www/views/Extjs3/javascript/form/HtmlEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ GO.form.HtmlEditor = function (config) {
var ioDentPlugin = new Ext.ux.form.HtmlEditor.IndentOutdent();
var ssScriptPlugin = new Ext.ux.form.HtmlEditor.SubSuperScript();
var rmFormatPlugin = new Ext.ux.form.HtmlEditor.RemoveFormat();
var tblPlugin = new Ext.ux.form.HtmlEditor.NEWTablePlugin();
var fontPlugin = new Ext.ux.form.HtmlEditor.FontSelector();


if (GO.settings.pspellSupport) {
config.plugins.unshift(spellcheckInsertPlugin);
}

config.plugins.unshift(
tblPlugin,
fontPlugin,
ioDentPlugin,
rmFormatPlugin,
// wordPastePlugin,
Expand Down
Loading