Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-28 09:39:42 +02:00
Code Releases Activity

Merge pull request #31 from documize/tinymce-loading

Browse source 
Tinymce loading
This commit is contained in:
Harvey Kandola 2016-08-02 14:41:25 +01:00 • committed by GitHub
commit 0a9e9ec2cb
4 changed files with 93 additions and 13313 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -61,3 +61,5 @@ debug
Dockerfile Dockerfile
container.sh container.sh
make.sh make.sh
embed/bindata_assetfs.go

4
app/app/components/section/wysiwyg/type-editor.js
View file

@ -71,13 +71,13 @@ export default Ember.Component.extend({
} }
}, },
toolbar1: "formatselect fontselect fontsizeselect | bold italic underline | link unlink | image media | codesample | outdent indent | alignleft aligncenter alignright alignjustify | bullist numlist | forecolor backcolor", toolbar1: "formatselect fontselect fontsizeselect | bold italic underline | link unlink | image media | codesample | outdent indent | alignleft aligncenter alignright alignjustify | bullist numlist | forecolor backcolor",
save_onsavecallback: function() { save_onsavecallback: function () {
self.send('onAction'); self.send('onAction');
} }
}; };
if (typeof tinymce === 'undefined') { if (typeof tinymce === 'undefined') {
$.getScript(this.get("appMeta").getBaseUrl("tinymce/tinymce.min.js?v=430"), function() { $.getScript("tinymce/tinymce.min.js?v=430", function () {
window.tinymce.dom.Event.domLoaded = true; window.tinymce.dom.Event.domLoaded = true;
tinymce.baseURL = "//" + window.location.host + "/tinymce"; tinymce.baseURL = "//" + window.location.host + "/tinymce";
tinymce.suffix = ".min"; tinymce.suffix = ".min";

2
core/product.go
View file

@ -27,7 +27,7 @@ type ProdInfo struct {
func Product() (p ProdInfo) { func Product() (p ProdInfo) {
p.Major = "0" p.Major = "0"
p.Minor = "16" p.Minor = "16"
p.Patch = "0" p.Patch = "1"
p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch) p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch)
p.Edition = "Community" p.Edition = "Community"
p.Title = fmt.Sprintf("%s Edition", p.Edition) p.Title = fmt.Sprintf("%s Edition", p.Edition)

13222
embed/bindata_assetfs.go
View file

File diff suppressed because one or more lines are too long