Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TinyMCE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nick Barry
TinyMCE
Commits
fa97b62a
Commit
fa97b62a
authored
11 years ago
by
Nick Barry
Browse files
Options
Downloads
Patches
Plain Diff
Updated table plugin row and cell to not use deprecated attributes
parent
76947c49
Branches
master
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+2
-0
2 additions, 0 deletions
README.md
plugins/table/js/cell.js
+23
-2
23 additions, 2 deletions
plugins/table/js/cell.js
plugins/table/js/row.js
+22
-2
22 additions, 2 deletions
plugins/table/js/row.js
with
47 additions
and
4 deletions
README.md
+
2
−
0
View file @
fa97b62a
...
...
@@ -2,4 +2,6 @@ UNL Modifications to Core (Marked with "Start UNL Change"):
----------------
Both image.js files (in plugins/advimage/js and themes/advanced/js) have been modified to not autofill image width and height.
Table plugin (plugins/table/js/row.js and plugins/table/js/cell.js) have been modified to use CSS styles instead on deprecated attributes
----------------
This diff is collapsed.
Click to expand it.
plugins/table/js/cell.js
+
23
−
2
View file @
fa97b62a
...
...
@@ -18,7 +18,13 @@ function init() {
// Get table cell data
var
celltype
=
tdElm
.
nodeName
.
toLowerCase
();
var
align
=
ed
.
dom
.
getAttrib
(
tdElm
,
'
align
'
);
if
(
getStyle
(
tdElm
,
'
text-align
'
,
'
text-align
'
)
!=
""
)
{
align
=
getStyle
(
tdElm
,
'
text-align
'
,
'
text-align
'
);
}
var
valign
=
ed
.
dom
.
getAttrib
(
tdElm
,
'
valign
'
);
if
(
getStyle
(
tdElm
,
'
vertical-align
'
,
'
vertical-align
'
)
!=
""
)
{
valign
=
getStyle
(
tdElm
,
'
vertical-align
'
,
'
vertical-align
'
);
}
var
width
=
trimSize
(
getStyle
(
tdElm
,
'
width
'
,
'
width
'
));
var
height
=
trimSize
(
getStyle
(
tdElm
,
'
height
'
,
'
height
'
));
var
bordercolor
=
convertRGBToHex
(
getStyle
(
tdElm
,
'
bordercolor
'
,
'
borderLeftColor
'
));
...
...
@@ -201,8 +207,8 @@ function updateCell(td, skip_id) {
if
(
!
skip_id
)
dom
.
setAttrib
(
td
,
'
id
'
,
formObj
.
id
.
value
);
dom
.
setAttrib
(
td
,
'
align
'
,
formObj
.
align
.
value
);
dom
.
setAttrib
(
td
,
'
vAlign
'
,
formObj
.
valign
.
value
);
//
dom.setAttrib(td, 'align', formObj.align.value);
//
dom.setAttrib(td, 'vAlign', formObj.valign.value);
dom
.
setAttrib
(
td
,
'
lang
'
,
formObj
.
lang
.
value
);
dom
.
setAttrib
(
td
,
'
dir
'
,
getSelectValue
(
formObj
,
'
dir
'
));
dom
.
setAttrib
(
td
,
'
style
'
,
ed
.
dom
.
serializeStyle
(
ed
.
dom
.
parseStyle
(
formObj
.
style
.
value
)));
...
...
@@ -215,10 +221,25 @@ function updateCell(td, skip_id) {
ed
.
dom
.
setAttrib
(
td
,
'
bgColor
'
,
''
);
ed
.
dom
.
setAttrib
(
td
,
'
borderColor
'
,
''
);
ed
.
dom
.
setAttrib
(
td
,
'
background
'
,
''
);
ed
.
dom
.
setAttrib
(
td
,
'
align
'
,
''
);
ed
.
dom
.
setAttrib
(
td
,
'
vAlign
'
,
''
);
// Set styles
td
.
style
.
width
=
getCSSSize
(
formObj
.
width
.
value
);
td
.
style
.
height
=
getCSSSize
(
formObj
.
height
.
value
);
if
(
formObj
.
align
.
value
!=
""
)
{
td
.
style
.
textAlign
=
formObj
.
align
.
value
;
}
else
{
td
.
style
.
textAlign
=
''
;
}
if
(
formObj
.
valign
.
value
!=
""
)
{
td
.
style
.
verticalAlign
=
formObj
.
valign
.
value
;
}
else
{
td
.
style
.
verticalAlign
=
''
;
}
if
(
formObj
.
bordercolor
.
value
!=
""
)
{
td
.
style
.
borderColor
=
formObj
.
bordercolor
.
value
;
td
.
style
.
borderStyle
=
td
.
style
.
borderStyle
==
""
?
"
solid
"
:
td
.
style
.
borderStyle
;
...
...
This diff is collapsed.
Click to expand it.
plugins/table/js/row.js
+
22
−
2
View file @
fa97b62a
...
...
@@ -15,7 +15,13 @@ function init() {
// Get table row data
var
rowtype
=
trElm
.
parentNode
.
nodeName
.
toLowerCase
();
var
align
=
dom
.
getAttrib
(
trElm
,
'
align
'
);
if
(
getStyle
(
trElm
,
'
text-align
'
,
'
text-align
'
)
!=
""
)
{
align
=
getStyle
(
trElm
,
'
text-align
'
,
'
text-align
'
);
}
var
valign
=
dom
.
getAttrib
(
trElm
,
'
valign
'
);
if
(
getStyle
(
trElm
,
'
vertical-align
'
,
'
vertical-align
'
)
!=
""
)
{
valign
=
getStyle
(
trElm
,
'
vertical-align
'
,
'
vertical-align
'
);
}
var
height
=
trimSize
(
getStyle
(
trElm
,
'
height
'
,
'
height
'
));
var
className
=
dom
.
getAttrib
(
trElm
,
'
class
'
);
var
bgcolor
=
convertRGBToHex
(
getStyle
(
trElm
,
'
bgcolor
'
,
'
backgroundColor
'
));
...
...
@@ -129,8 +135,8 @@ function updateRow(tr_elm, skip_id, skip_parent) {
if
(
!
skip_id
)
dom
.
setAttrib
(
tr_elm
,
'
id
'
,
formObj
.
id
.
value
);
dom
.
setAttrib
(
tr_elm
,
'
align
'
,
getSelectValue
(
formObj
,
'
align
'
));
dom
.
setAttrib
(
tr_elm
,
'
vAlign
'
,
getSelectValue
(
formObj
,
'
valign
'
));
//
dom.setAttrib(tr_elm, 'align', getSelectValue(formObj, 'align'));
//
dom.setAttrib(tr_elm, 'vAlign', getSelectValue(formObj, 'valign'));
dom
.
setAttrib
(
tr_elm
,
'
lang
'
,
formObj
.
lang
.
value
);
dom
.
setAttrib
(
tr_elm
,
'
dir
'
,
getSelectValue
(
formObj
,
'
dir
'
));
dom
.
setAttrib
(
tr_elm
,
'
style
'
,
dom
.
serializeStyle
(
dom
.
parseStyle
(
formObj
.
style
.
value
)));
...
...
@@ -140,11 +146,25 @@ function updateRow(tr_elm, skip_id, skip_parent) {
dom
.
setAttrib
(
tr_elm
,
'
background
'
,
''
);
dom
.
setAttrib
(
tr_elm
,
'
bgColor
'
,
''
);
dom
.
setAttrib
(
tr_elm
,
'
height
'
,
''
);
dom
.
setAttrib
(
tr_elm
,
'
align
'
,
''
);
dom
.
setAttrib
(
tr_elm
,
'
vAlign
'
,
''
);
// Set styles
tr_elm
.
style
.
height
=
getCSSSize
(
formObj
.
height
.
value
);
tr_elm
.
style
.
backgroundColor
=
formObj
.
bgcolor
.
value
;
if
(
formObj
.
align
.
value
!=
""
)
{
tr_elm
.
style
.
textAlign
=
formObj
.
align
.
value
;
}
else
{
tr_elm
.
style
.
textAlign
=
''
;
}
if
(
formObj
.
valign
.
value
!=
""
)
{
tr_elm
.
style
.
verticalAlign
=
formObj
.
valign
.
value
;
}
else
{
tr_elm
.
style
.
verticalAlign
=
''
;
}
if
(
formObj
.
backgroundimage
.
value
!=
""
)
tr_elm
.
style
.
backgroundImage
=
"
url('
"
+
formObj
.
backgroundimage
.
value
+
"
')
"
;
else
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment