Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mikolaï Krol
erp5
Commits
924411f0
Commit
924411f0
authored
Jan 09, 2018
by
Vincent Bechu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_officejs][erp5_officejs_ui_test] Add maximize in text editor
/reviewed-on
nexedi/erp5!544
parent
a5aec50a
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
391 additions
and
82 deletions
+391
-82
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js
...m/web_page_module/gadget_officejs_jio_web_page_view_js.js
+23
-29
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml
.../web_page_module/gadget_officejs_jio_web_page_view_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.js
...ateItem/web_page_module/gadget_officejs_page_export_js.js
+1
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.xml
...teItem/web_page_module/gadget_officejs_page_export_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml
.../web_page_module/gadget_officejs_text_editor_appcache.xml
+348
-5
bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_text_editor/app.xml
...TemplateItem/web_site_module/officejs_text_editor/app.xml
+6
-4
bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditor.zpt
...s/officejs_ui_texteditor_zuite/testOfficeJSTextEditor.zpt
+9
-19
bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorErp5Synchronization.zpt
...ditor_zuite/testOfficeJSTextEditorErp5Synchronization.zpt
+0
-20
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js
View file @
924411f0
...
@@ -21,8 +21,7 @@
...
@@ -21,8 +21,7 @@
.
declareMethod
(
"
render
"
,
function
(
options
)
{
.
declareMethod
(
"
render
"
,
function
(
options
)
{
return
this
.
changeState
({
return
this
.
changeState
({
jio_key
:
options
.
jio_key
,
jio_key
:
options
.
jio_key
,
doc
:
options
.
doc
,
doc
:
options
.
doc
editable
:
options
.
editable
?
1
:
0
});
});
})
})
...
@@ -51,7 +50,6 @@
...
@@ -51,7 +50,6 @@
var
gadget
=
this
;
var
gadget
=
this
;
return
gadget
.
getDeclaredGadget
(
'
form_view
'
)
return
gadget
.
getDeclaredGadget
(
'
form_view
'
)
.
push
(
function
(
form_gadget
)
{
.
push
(
function
(
form_gadget
)
{
var
editable
=
gadget
.
state
.
editable
;
return
form_gadget
.
render
({
return
form_gadget
.
render
({
erp5_document
:
{
erp5_document
:
{
"
_embedded
"
:
{
"
_view
"
:
{
"
_embedded
"
:
{
"
_view
"
:
{
...
@@ -61,9 +59,9 @@
...
@@ -61,9 +59,9 @@
"
default
"
:
gadget
.
state
.
doc
.
title
,
"
default
"
:
gadget
.
state
.
doc
.
title
,
"
css_class
"
:
""
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
required
"
:
1
,
"
editable
"
:
1
-
editable
,
"
editable
"
:
1
,
"
key
"
:
"
title
"
,
"
key
"
:
"
title
"
,
"
hidden
"
:
editable
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
"
type
"
:
"
StringField
"
},
},
"
my_reference
"
:
{
"
my_reference
"
:
{
...
@@ -72,9 +70,9 @@
...
@@ -72,9 +70,9 @@
"
default
"
:
gadget
.
state
.
doc
.
reference
,
"
default
"
:
gadget
.
state
.
doc
.
reference
,
"
css_class
"
:
""
,
"
css_class
"
:
""
,
"
required
"
:
0
,
"
required
"
:
0
,
"
editable
"
:
1
-
editable
,
"
editable
"
:
1
,
"
key
"
:
"
reference
"
,
"
key
"
:
"
reference
"
,
"
hidden
"
:
editable
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
"
type
"
:
"
StringField
"
},
},
"
my_version
"
:
{
"
my_version
"
:
{
...
@@ -83,9 +81,9 @@
...
@@ -83,9 +81,9 @@
"
default
"
:
gadget
.
state
.
doc
.
version
,
"
default
"
:
gadget
.
state
.
doc
.
version
,
"
css_class
"
:
""
,
"
css_class
"
:
""
,
"
required
"
:
0
,
"
required
"
:
0
,
"
editable
"
:
1
-
editable
,
"
editable
"
:
1
,
"
key
"
:
"
version
"
,
"
key
"
:
"
version
"
,
"
hidden
"
:
editable
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
"
type
"
:
"
StringField
"
},
},
"
my_language
"
:
{
"
my_language
"
:
{
...
@@ -94,9 +92,9 @@
...
@@ -94,9 +92,9 @@
"
default
"
:
gadget
.
state
.
doc
.
language
,
"
default
"
:
gadget
.
state
.
doc
.
language
,
"
css_class
"
:
""
,
"
css_class
"
:
""
,
"
required
"
:
0
,
"
required
"
:
0
,
"
editable
"
:
1
-
editable
,
"
editable
"
:
1
,
"
key
"
:
"
language
"
,
"
key
"
:
"
language
"
,
"
hidden
"
:
editable
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
"
type
"
:
"
StringField
"
},
},
"
my_description
"
:
{
"
my_description
"
:
{
...
@@ -105,21 +103,22 @@
...
@@ -105,21 +103,22 @@
"
default
"
:
gadget
.
state
.
doc
.
description
,
"
default
"
:
gadget
.
state
.
doc
.
description
,
"
css_class
"
:
""
,
"
css_class
"
:
""
,
"
required
"
:
0
,
"
required
"
:
0
,
"
editable
"
:
1
-
editable
,
"
editable
"
:
1
,
"
key
"
:
"
description
"
,
"
key
"
:
"
description
"
,
"
hidden
"
:
editable
,
"
hidden
"
:
0
,
"
type
"
:
"
TextAreaField
"
"
type
"
:
"
TextAreaField
"
},
},
"
my_content
"
:
{
"
my_content
"
:
{
"
default
"
:
gadget
.
state
.
doc
.
text_content
,
"
default
"
:
gadget
.
state
.
doc
.
text_content
,
"
css_class
"
:
editable
===
1
?
"
content-iframe-maximize
"
:
""
,
"
css_class
"
:
""
,
"
required
"
:
0
,
"
required
"
:
0
,
"
editable
"
:
editable
,
"
editable
"
:
1
,
"
key
"
:
"
text_content
"
,
"
key
"
:
"
text_content
"
,
"
hidden
"
:
0
,
"
hidden
"
:
0
,
"
type
"
:
editable
===
1
?
"
GadgetField
"
:
"
EditorField
"
,
"
renderjs_extra
"
:
'
{"editor": "fck_editor", "maximize": true}
'
,
"
url
"
:
"
../officejs_ckeditor_gadget/app/
"
,
"
type
"
:
"
GadgetField
"
,
"
sandbox
"
:
"
iframe
"
"
url
"
:
"
gadget_editor.html
"
,
"
sandbox
"
:
"
public
"
}
}
}},
}},
"
_links
"
:
{
"
_links
"
:
{
...
@@ -144,22 +143,17 @@
...
@@ -144,22 +143,17 @@
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
history_previous
'
}),
gadget
.
getUrlFor
({
command
:
'
history_previous
'
}),
gadget
.
getUrlFor
({
command
:
'
selection_previous
'
}),
gadget
.
getUrlFor
({
command
:
'
selection_previous
'
}),
gadget
.
getUrlFor
({
command
:
'
selection_next
'
}),
gadget
.
getUrlFor
({
command
:
'
selection_next
'
})
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
editable
:
true
}})
]);
]);
})
})
.
push
(
function
(
url_list
)
{
.
push
(
function
(
url_list
)
{
var
header_dict
=
{
return
gadget
.
updateHeader
(
{
page_title
:
gadget
.
state
.
doc
.
title
,
page_title
:
gadget
.
state
.
doc
.
title
,
save_action
:
true
,
selection_url
:
url_list
[
0
],
selection_url
:
url_list
[
0
],
save_action
:
true
previous_url
:
url_list
[
1
],
};
next_url
:
url_list
[
2
]
if
(
!
gadget
.
state
.
editable
)
{
});
header_dict
.
previous_url
=
url_list
[
1
];
header_dict
.
next_url
=
url_list
[
2
];
header_dict
.
edit_content
=
url_list
[
3
];
}
return
gadget
.
updateHeader
(
header_dict
);
});
});
});
});
}(
window
,
rJS
,
RSVP
));
}(
window
,
rJS
,
RSVP
));
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml
View file @
924411f0
...
@@ -232,7 +232,7 @@
...
@@ -232,7 +232,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
2.37368.2625.44083
</string>
</value>
<value>
<string>
96
4.45581.43675.37307
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
07276723.18
</float>
<float>
15
15490519.85
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.js
View file @
924411f0
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
"
Text Editor
"
:
{
"
Text Editor
"
:
{
"
url
"
:
"
officejs_text_editor/
"
,
"
url
"
:
"
officejs_text_editor/
"
,
"
cache
"
:
"
gadget_officejs_text_editor.appcache
"
,
"
cache
"
:
"
gadget_officejs_text_editor.appcache
"
,
"
sub_gadget
"
:
[
"
officejs_
ckeditor_gadget
"
,
"
officejs_
setting_gadget
"
]
"
sub_gadget
"
:
[
"
officejs_setting_gadget
"
]
},
},
"
Illustration Editor
"
:
{
"
Illustration Editor
"
:
{
"
url
"
:
"
officejs_svg_editor/
"
,
"
url
"
:
"
officejs_svg_editor/
"
,
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.xml
View file @
924411f0
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.47833.26373.64597
</string>
</value>
<value>
<string>
96
4.45862.32132.53930
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -272,7 +272,7 @@
...
@@ -272,7 +272,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
151
1961491
.29
</float>
<float>
151
5504420
.29
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml
View file @
924411f0
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_text_editor/app.xml
View file @
924411f0
...
@@ -391,7 +391,9 @@
...
@@ -391,7 +391,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
configuration_stylesheet_url
</string>
</key>
<key>
<string>
configuration_stylesheet_url
</string>
</key>
<value>
<string>
gadget_officejs_nojqm.css
</string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
configuration_translation_gadget_url
</string>
</key>
<key>
<string>
configuration_translation_gadget_url
</string>
</key>
...
@@ -650,7 +652,7 @@
...
@@ -650,7 +652,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
vincent
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -664,7 +666,7 @@
...
@@ -664,7 +666,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
1.16277.24517.44253
</string>
</value>
<value>
<string>
96
4.45575.40638.63488
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -682,7 +684,7 @@
...
@@ -682,7 +684,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
04529296.6
3
</float>
<float>
15
15487277.4
3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditor.zpt
View file @
924411f0
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
link=Local is Enough
</td>
<td>
//a[@data-i18n='Storages']
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
...
@@ -88,37 +88,37 @@
...
@@ -88,37 +88,37 @@
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
link=Local is Enough
</td>
<td>
//a[@data-i18n='Storages']
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
link=Local is Enough
</td>
<td>
//a[@data-i18n='Storages']
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
link=
Add
</td>
<td>
link=
Local is Enough
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
link=
Add
</td>
<td>
link=
Local is Enough
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
//button[@data-i18n='Save']
</td>
<td>
link=Add
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//button[@data-i18n='Menu']
</td>
<td>
link=Add
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
waitForElementPresent
</td>
<td>
name=editable
</td>
<td>
//button[@data-i18n='Save']
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
...
@@ -236,16 +236,6 @@
...
@@ -236,16 +236,6 @@
<td>
//textarea[@title='Description']
</td>
<td>
//textarea[@title='Description']
</td>
<td>
${description}
</td>
<td>
${description}
</td>
</tr>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
link=Content
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
link=Content
</td>
<td></td>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
identifier=cke_1_contents
</td>
<td>
identifier=cke_1_contents
</td>
...
...
bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorErp5Synchronization.zpt
View file @
924411f0
...
@@ -77,16 +77,6 @@
...
@@ -77,16 +77,6 @@
<td>
//button[@data-i18n='Save']
</td>
<td>
//button[@data-i18n='Save']
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<td>
click
</td>
<td>
//button[@data-i18n='Menu']
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
name=editable
</td>
<td></td>
</tr>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
identifier=title
</td>
<td>
identifier=title
</td>
...
@@ -153,16 +143,6 @@
...
@@ -153,16 +143,6 @@
<td>
//button[@data-i18n='Save']
</td>
<td>
//button[@data-i18n='Save']
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<td>
click
</td>
<td>
//button[@data-i18n='Menu']
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
name=editable
</td>
<td></td>
</tr>
<tr>
<tr>
<td>
store
</td>
<td>
store
</td>
<td>
search
</td>
<td>
search
</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment