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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
7d59d147
Commit
7d59d147
authored
Feb 19, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Force editable on desktop
parent
0b819055
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
8 deletions
+24
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
...mplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
+4
-0
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
...plateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
+3
-3
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
...TemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
+15
-3
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
View file @
7d59d147
...
@@ -374,6 +374,10 @@
...
@@ -374,6 +374,10 @@
]);
]);
})
})
.
allowPublicAcquisition
(
'
isDesktopMedia
'
,
function
(
argument_list
)
{
return
window
.
matchMedia
(
"
(min-width: 85em)
"
).
matches
;
})
.
allowPublicAcquisition
(
'
refresh
'
,
function
()
{
.
allowPublicAcquisition
(
'
refresh
'
,
function
()
{
var
gadget
=
this
;
var
gadget
=
this
;
return
gadget
.
getDeclaredGadget
(
MAIN_SCOPE
)
return
gadget
.
getDeclaredGadget
(
MAIN_SCOPE
)
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
View file @
7d59d147
...
@@ -216,7 +216,7 @@
...
@@ -216,7 +216,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
vincent
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
4.44401.33443.35072
</string>
</value>
<value>
<string>
96
5.3167.36247.3959
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
151
6619185.21
</float>
<float>
151
9038006.66
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
7d59d147
...
@@ -639,9 +639,20 @@
...
@@ -639,9 +639,20 @@
// Nothing. Go to front page
// Nothing. Go to front page
// If no frontpage is configured, his may comes from missing configuration on website
// If no frontpage is configured, his may comes from missing configuration on website
// or default HTML gadget modification date more recent than the website modification date
// or default HTML gadget modification date more recent than the website modification date
return
gadget
.
getSetting
(
"
frontpage_gadget
"
)
return
new
RSVP
.
Queue
()
.
push
(
function
(
result
)
{
.
push
(
function
()
{
var
options
=
{
page
:
result
};
return
RSVP
.
all
([
gadget
.
getSetting
(
"
frontpage_gadget
"
),
gadget
.
isDesktopMedia
()
]);
})
.
push
(
function
(
result_list
)
{
var
options
=
{
page
:
result_list
[
0
]};
if
(
result_list
[
1
])
{
// When displayed on a desktop, force the UI
// to be in editable mode by default
options
.
editable
=
true
;
}
if
(
previous_options
===
undefined
)
{
if
(
previous_options
===
undefined
)
{
previous_options
=
{};
previous_options
=
{};
}
}
...
@@ -1044,6 +1055,7 @@
...
@@ -1044,6 +1055,7 @@
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
renderError
'
,
'
reportServiceError
'
)
.
declareAcquiredMethod
(
'
renderError
'
,
'
reportServiceError
'
)
.
declareAcquiredMethod
(
'
translate
'
,
'
translate
'
)
.
declareAcquiredMethod
(
'
translate
'
,
'
translate
'
)
.
declareAcquiredMethod
(
'
isDesktopMedia
'
,
'
isDesktopMedia
'
)
.
declareJob
(
'
listenHashChange
'
,
function
()
{
.
declareJob
(
'
listenHashChange
'
,
function
()
{
return
listenHashChange
(
this
);
return
listenHashChange
(
this
);
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
7d59d147
...
@@ -232,7 +232,7 @@
...
@@ -232,7 +232,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
965.
29272.2871.14455
</string>
</value>
<value>
<string>
965.
39308.13571.6894
</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>
151
8441236.24
</float>
<float>
151
9043897.55
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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