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.

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

WOBS-3528: Raw encoding for caption editor #860

Merged
merged 1 commit into from Jan 15, 2015

Conversation

Projects
None yet
4 participants
@m038
Copy link
Contributor

m038 commented Oct 22, 2014

Fixes issue with TinyMCE converting special characters to html entities. Now encoding is set to raw.

@@ -188,9 +289,11 @@ function editor_load_tinymce($p_dbColumns, $p_user, $p_editorLanguage, $options=
delete tinyMceOptions.max_chars;
}
 
console.log($('<?php echo $textareas;?>'));

This comment has been minimized.

@takeit

takeit Oct 23, 2014

Member

should be removed

@takeit

This comment has been minimized.

Copy link
Member

takeit commented Oct 23, 2014

👍

@m038 m038 changed the title WIP - WOBS-3528: Raw encoding for caption editor WOBS-3528: Raw encoding for caption editor Nov 6, 2014

@m038 m038 changed the title WOBS-3528: Raw encoding for caption editor WIP - WOBS-3528: Raw encoding for caption editor Nov 6, 2014

@@ -603,7 +603,7 @@ CREATE TABLE `Images` (
PRIMARY KEY (`Id`),
KEY `IDX_E7B3BB5C447C15B9` (`UploadedByUser`),
KEY `is_updated_storage` (`is_updated_storage`),
KEY `Description` (`Description`),
KEY `Description` (`Description`(100)),

This comment has been minimized.

@takeit

takeit Dec 3, 2014

Member

is it also changed in upgrade scripts ?

This comment has been minimized.

@m038

m038 Dec 3, 2014

Author Contributor

Yeah, it was already done in 4b1753d, but forgot demo_tables.

@@ -2130,7 +2130,7 @@ CREATE TABLE `package_item` (
`package_id` int(11) DEFAULT NULL,
`image_id` int(11) DEFAULT NULL,
`offset` int(11) NOT NULL,
`caption` varchar(255) DEFAULT NULL,
`caption` text DEFAULT NULL,

This comment has been minimized.

@takeit

takeit Dec 3, 2014

Member

same here, is it also changed in upgrade scripts ?

This comment has been minimized.

@m038

m038 Dec 3, 2014

Author Contributor

Same commit 4b1753d, forgot in demo_tables again.

@m038 m038 force-pushed the m038:WOBS-3528 branch from d62af03 to f218cac Dec 16, 2014

@@ -3204,7 +3207,7 @@ CREATE TABLE IF NOT EXISTS `package_item` (
`package_id` int(11) DEFAULT NULL,
`image_id` int(11) DEFAULT NULL,
`offset` int(11) NOT NULL,
`caption` varchar(255) DEFAULT NULL,
`caption` text DEFAULT NULL,

This comment has been minimized.

@m038

m038 Dec 17, 2014

Author Contributor

See 4b1753d for code in upgrade script.

CREATE TABLE `ArticleImageCaptions` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`IdLanguage` int(11) NOT NULL,
`IdImage` int(11) NOT NULL,
`NrArticle` int(11) NOT NULL,
`caption` varchar(255) NOT NULL,
`caption` TEXT DEFAULT NULL,

This comment has been minimized.

@m038

m038 Dec 17, 2014

Author Contributor

See 4b1753d for code in upgrade script.

@m038 m038 changed the title WIP - WOBS-3528: Raw encoding for caption editor WOBS-3528: Raw encoding for caption editor Dec 17, 2014

@girgen79

This comment has been minimized.

Copy link

girgen79 commented Dec 17, 2014

tested and accepted

CS-4849: Implements Rich Text Captions fully
- Now uses same editor implementation as arictle screen
- Adds RTE captions to multi-edit view after uploading files
- Adds RTE captions to inline images
- RTE captions are rendered inside <p>-tag (always
- Limited useage of certain html elements
- Fixes toolbar lengths
- Fixes caching issues with inline images dialog

@m038 m038 force-pushed the m038:WOBS-3528 branch from ebfda23 to 080d35c Jan 8, 2015

ahilles107 added a commit that referenced this pull request Jan 15, 2015

Merge pull request #860 from m038/WOBS-3528
WOBS-3528: Raw encoding for caption editor

@ahilles107 ahilles107 merged commit 2d1ebbe into sourcefabric:v4.3 Jan 15, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment