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
Labels
Merge Requests
137
Merge Requests
137
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
7847b5db
Commit
7847b5db
authored
Dec 26, 2019
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monaco_editor: fixup broken commit
3d3ee5da
had syntax error and test were not updated for new behavior
parent
5d5e0c49
Pipeline
#7272
passed with stage
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
6 deletions
+20
-6
bt5/erp5_monaco_editor/SkinTemplateItem/portal_skins/erp5_monaco_editor/monaco-editor.gadget.js.js
...ortal_skins/erp5_monaco_editor/monaco-editor.gadget.js.js
+3
-2
bt5/erp5_monaco_editor_ui_test/PathTemplateItem/portal_tests/monaco_editor_zuite/testTextEditorRenderJSStyle.zpt
...tests/monaco_editor_zuite/testTextEditorRenderJSStyle.zpt
+9
-2
bt5/erp5_monaco_editor_ui_test/PathTemplateItem/portal_tests/monaco_editor_zuite/testTextEditorXHTMLStyle.zpt
...al_tests/monaco_editor_zuite/testTextEditorXHTMLStyle.zpt
+8
-2
No files found.
bt5/erp5_monaco_editor/SkinTemplateItem/portal_skins/erp5_monaco_editor/monaco-editor.gadget.js.js
View file @
7847b5db
...
...
@@ -171,8 +171,9 @@
.
push
(
addExtraLibrary
(
'
./monaco-renderjs.d.ts
'
,
'
renderjs
'
))
.
push
(
addExtraLibrary
(
'
./monaco-jio.d.ts
'
,
'
jio
'
));
}
if
(
modification_dict
.
hasOwnProperty
(
'
editable
'
)){
gadget
.
editor
.
updateOptions
({
readOnly
:
!
this
.
state
.
editable
});
if
(
modification_dict
.
hasOwnProperty
(
'
editable
'
)){
this
.
editor
.
updateOptions
({
readOnly
:
!
this
.
state
.
editable
});
}
}
return
queue
;
})
...
...
bt5/erp5_monaco_editor_ui_test/PathTemplateItem/portal_tests/monaco_editor_zuite/testTextEditorRenderJSStyle.zpt
View file @
7847b5db
...
...
@@ -90,9 +90,16 @@
<td>
//a[@data-i18n="View"]
</td><td></td></tr>
<tr><td>
click
</td>
<td>
//a[@data-i18n="View"]
</td><td></td></tr>
<tr><td>
waitForElementPresent
</td>
<td>
//div[@data-gadget-scope="editor"]//iframe
</td><td></td></tr>
<tr><td>
selectFrame
</td>
<td>
//div[@data-gadget-scope="editor"]//iframe
</td><td></td></tr>
<tr><td>
waitForText
</td>
<td>
//div[@data-gadget-scope="field_my_text_content"]//pre
</td>
<td>
Hello
</td></tr>
<td>
//body
</td>
<!-- we have line number -->
<td>
glob:1*Hello
</td></tr>
<tr><td>
selectFrame
</td>
<td>
relative=top
</td><td></td></tr>
</tbody></table>
</body>
...
...
bt5/erp5_monaco_editor_ui_test/PathTemplateItem/portal_tests/monaco_editor_zuite/testTextEditorXHTMLStyle.zpt
View file @
7847b5db
...
...
@@ -66,9 +66,15 @@
<tr><td>
click
</td>
<td>
//div[@class="actions"]//span[text() = "View"]
</td><td></td></tr>
<tr><td>
waitForElementPresent
</td>
<td>
css=.bottom iframe
</td><td></td></tr>
<tr><td>
selectFrame
</td>
<td>
css=.bottom iframe
</td><td></td></tr>
<tr><td>
waitForText
</td>
<td>
css=.bottom pre
</td>
<td>
Hello
</td></tr>
<td>
//body
</td>
<td>
glob:1*Hello
</td></tr>
<tr><td>
selectFrame
</td>
<td>
relative=top
</td><td></td></tr>
</tbody></table>
</body>
...
...
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