ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2579 from emanuelschuetze/fix-projector

Browse Source 
Fix regression with projector loading.
This commit is contained in:
Emanuel Schütze 2016-11-02 14:18:49 +01:00 committed by GitHub
commit 2966fa91ff
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
openslides/core/static/js/core/base.js
View File

@ -460,6 +460,40 @@ angular.module('OpenSlidesApp.core', [
}
])
// Options for TinyMCE editor used in various create and edit views.
// Required in core/base.js because MotionComment factory which used this
// factory has to placed in motions/base.js.
.factory('Editor', [
'gettextCatalog',
function (gettextCatalog) {
return {
getOptions: function (images, inlineMode) {
if (inlineMode === undefined) {
inlineMode = false;
}
return {
language_url: '/static/tinymce/i18n/' + gettextCatalog.getCurrentLanguage() + '.js',
theme_url: '/static/js/openslides-libs.js',
skin_url: '/static/tinymce/skins/lightgray/',
inline: inlineMode,
statusbar: false,
browser_spellcheck: true,
image_advtab: true,
image_list: images,
plugins: [
'lists link autolink charmap preview searchreplace code fullscreen',
'paste textcolor colorpicker image imagetools'
],
menubar: '',
toolbar: 'undo redo searchreplace | styleselect | bold italic underline strikethrough ' +
'forecolor backcolor removeformat | bullist numlist | outdent indent | ' +
'link image charmap table | code preview fullscreen'
};
}
};
}
])
/* Model for a projector.
*
* At the moment we use only one projector, so there will be only one object

31
openslides/core/static/js/core/site.js
View File

@ -405,37 +405,6 @@ angular.module('OpenSlidesApp.core.site', [
}
])
// Options for TinyMCE editor used in various create and edit views.
.factory('Editor', [
'gettextCatalog',
function (gettextCatalog) {
return {
getOptions: function (images, inlineMode) {
if (inlineMode === undefined) {
inlineMode = false;
}
return {
language_url: '/static/tinymce/i18n/' + gettextCatalog.getCurrentLanguage() + '.js',
theme_url: '/static/js/openslides-libs.js',
skin_url: '/static/tinymce/skins/lightgray/',
inline: inlineMode,
browser_spellcheck: true,
image_advtab: true,
image_list: images,
plugins: [
'lists link autolink charmap preview searchreplace code fullscreen',
'paste textcolor colorpicker image imagetools wordcount'
],
menubar: '',
toolbar: 'undo redo searchreplace | styleselect | bold italic underline strikethrough ' +
'forecolor backcolor removeformat | bullist numlist | outdent indent | ' +
'link image charmap table | code preview fullscreen'
};
}
};
}
])
// html-tag os-form-field to generate generic from fields
// TODO: make it possible to use other fields then config fields
.directive('osFormField', [