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

Jump to bottom

Feature/fix cke link popup #4427

Merged
merged 4 commits into from
Jan 21, 2021
Merged

Feature/fix cke link popup #4427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8beffd8
copy of default link plugin
skamphuis Jan 21, 2021
d933930
copy of default link plugin
skamphuis Jan 21, 2021
445eb42
new dnnpages plugin based on new links plugin
skamphuis Jan 21, 2021
d02d27a
removed unneeded js
skamphuis Jan 21, 2021
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
1 change: 0 additions & 1 deletion DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@
<Content Include="css\Options.css" />
<Content Include="Install\DNNCkeditor.license.txt" />
<Content Include="js\editorOverride.js" />
<Content Include="js\jquery.ckeditor.adapter.js" />
<Content Include="js\jquery.notification.js" />
<Content Include="js\jquery.ui.controls.js" />
<Content Include="js\Options.js" />
Expand Down
12 changes: 0 additions & 12 deletions DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Web/EditorControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,18 +1370,6 @@ private void RegisterCKEditorLibrary()
csType, CsName, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/ckeditor.js"));
}

if (
File.Exists(
this.Context.Server.MapPath(
"~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/jquery.ckeditor.adapter.js"))
&& !cs.IsClientScriptIncludeRegistered(csType, CsAdaptName))
{
cs.RegisterClientScriptInclude(
csType,
CsAdaptName,
Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/jquery.ckeditor.adapter.js"));
}

if (
File.Exists(
this.Context.Server.MapPath("~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.js")) &&
Expand Down
Loading