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

Revert this commit so that the hardcoded version will return to 1.9-SNAPSHOT.

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

This reverts commit 1167d910.
parent 4fc45d93
No related branches found
No related tags found
No related merge requests found
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
#set ($bootstrap3typeaheadPath = $services.webjars.url('org.webjars.npm:bootstrap-3-typeahead', 'bootstrap3-typeahead.min')) #set ($bootstrap3typeaheadPath = $services.webjars.url('org.webjars.npm:bootstrap-3-typeahead', 'bootstrap3-typeahead.min'))
#if ("$!ckeditorPath" == '') #if ("$!ckeditorPath" == '')
## Before 6.3RC1 ## Before 6.3RC1
#set ($ckeditorPath = $services.webjars.url('application-ckeditor-webjar/1.8.5/ckeditor.js')) #set ($ckeditorPath = $services.webjars.url('application-ckeditor-webjar/1.9-SNAPSHOT/ckeditor.js'))
#set ($bootstrap3typeaheadPath = $services.webjars.url('bootstrap-3-typeahead/4.0.1/bootstrap3-typeahead.min.js')) #set ($bootstrap3typeaheadPath = $services.webjars.url('bootstrap-3-typeahead/4.0.1/bootstrap3-typeahead.min.js'))
#elseif ($ckeditorPath.indexOf('?') >= 0) #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' ## 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 @@ ...@@ -680,7 +680,7 @@
#set ($ckeditorSkinPath = $services.webjars.url('org.xwiki.contrib:application-ckeditor-webjar', 'skins/moono')) #set ($ckeditorSkinPath = $services.webjars.url('org.xwiki.contrib:application-ckeditor-webjar', 'skins/moono'))
#if ("$!ckeditorSkinPath" == '') #if ("$!ckeditorSkinPath" == '')
## Before 6.3RC1 ## Before 6.3RC1
#set ($ckeditorSkinPath = $services.webjars.url('application-ckeditor-webjar/1.8.5/skins/moono')) #set ($ckeditorSkinPath = $services.webjars.url('application-ckeditor-webjar/1.9-SNAPSHOT/skins/moono'))
#end #end
#if ($ckeditorSkinPath.indexOf('?') >= 0) #if ($ckeditorSkinPath.indexOf('?') >= 0)
## The WebJar resource path was specified in the query string before 7.1M1 which prevented the browser from resolving ## The WebJar resource path was specified in the query string before 7.1M1 which prevented the browser from resolving
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
#end #end
#macro (importCKEditorCSS $path $evaluate) #macro (importCKEditorCSS $path $evaluate)
#importCSS('org.xwiki.contrib' 'application-ckeditor-webjar' '1.8.5' $path $evaluate) #importCSS('org.xwiki.contrib' 'application-ckeditor-webjar' '1.9-SNAPSHOT' $path $evaluate)
#end #end
#macro (importCKEditorResources) #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