Skip to content
Snippets Groups Projects
Commit 1167d910 authored by Caleb James DeLisle's avatar Caleb James DeLisle
Browse files

CKEDITOR-105: change hardcoded 1.9-SNAPSHOT to 1.8.5 in order to release

parent b212d349
No related branches found
No related tags found
No related merge requests found
......@@ -160,7 +160,7 @@
#set ($bootstrap3typeaheadPath = $services.webjars.url('org.webjars.npm:bootstrap-3-typeahead', 'bootstrap3-typeahead.min'))
#if ("$!ckeditorPath" == '')
## Before 6.3RC1
#set ($ckeditorPath = $services.webjars.url('application-ckeditor-webjar/1.9-SNAPSHOT/ckeditor.js'))
#set ($ckeditorPath = $services.webjars.url('application-ckeditor-webjar/1.8.5/ckeditor.js'))
#set ($bootstrap3typeaheadPath = $services.webjars.url('bootstrap-3-typeahead/4.0.1/bootstrap3-typeahead.min.js'))
#elseif ($ckeditorPath.indexOf('?') >= 0)
## Before 7.1M1 the WebJar resource path was included in the query string which means we have to specify the '.js'
......@@ -680,7 +680,7 @@
#set ($ckeditorSkinPath = $services.webjars.url('org.xwiki.contrib:application-ckeditor-webjar', 'skins/moono'))
#if ("$!ckeditorSkinPath" == '')
## Before 6.3RC1
#set ($ckeditorSkinPath = $services.webjars.url('application-ckeditor-webjar/1.9-SNAPSHOT/skins/moono'))
#set ($ckeditorSkinPath = $services.webjars.url('application-ckeditor-webjar/1.8.5/skins/moono'))
#end
#if ($ckeditorSkinPath.indexOf('?') >= 0)
## The WebJar resource path was specified in the query string before 7.1M1 which prevented the browser from resolving
......
......@@ -90,7 +90,7 @@
#end
#macro (importCKEditorCSS $path $evaluate)
#importCSS('org.xwiki.contrib' 'application-ckeditor-webjar' '1.9-SNAPSHOT' $path $evaluate)
#importCSS('org.xwiki.contrib' 'application-ckeditor-webjar' '1.8.5' $path $evaluate)
#end
#macro (importCKEditorResources)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment