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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xueyun Qian
erp5
Commits
acb5ca18
Commit
acb5ca18
authored
Nov 05, 2015
by
Vivek
Committed by
Kazuhiko Shiozaki
Nov 06, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: (fixup) modified router logic.
parent
2f4746b0
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
37 additions
and
46 deletions
+37
-46
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
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_html.xml
...age_module/gadget_officejs_page_jio_configurator_html.xml
+4
-4
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_dav_configurator_html.xml
...module/gadget_officejs_page_jio_dav_configurator_html.xml
+4
-4
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_dav_configurator_js.xml
...e_module/gadget_officejs_page_jio_dav_configurator_js.xml
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_router_js.xml
...emplateItem/web_page_module/gadget_officejs_router_js.xml
+12
-21
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_application_html.xml
...e_module/gadget_officejs_text_editor_application_html.xml
+5
-5
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_application_panel_html.xml
...le/gadget_officejs_text_editor_application_panel_html.xml
+6
-6
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml
View file @
acb5ca18
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
gadget.props.element.innerHTML = html;\n
gadget.props.element.innerHTML = html;\n
return gadget.updateHeader({\n
return gadget.updateHeader({\n
title: options.doc.title + " | Web Page",\n
title: options.doc.title + " | Web Page",\n
back_url: "#
?
page=text_editor_list",\n
back_url: "#page=text_editor_list",\n
panel_action: false,\n
panel_action: false,\n
save_action: true\n
save_action: true\n
});\n
});\n
...
@@ -411,7 +411,7 @@
...
@@ -411,7 +411,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.5
4860.11845.29678
</string>
</value>
<value>
<string>
946.5
9099.34897.19985
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -429,7 +429,7 @@
...
@@ -429,7 +429,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14467
29331.89
</float>
<float>
14467
40911.15
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_html.xml
View file @
acb5ca18
...
@@ -164,10 +164,10 @@
...
@@ -164,10 +164,10 @@
<div
class=
"ui-controlgroup ui-controlgroup-horizontal"
>
\n
<div
class=
"ui-controlgroup ui-controlgroup-horizontal"
>
\n
<div
class=
"ui-grid-a ui-responsive"
>
\n
<div
class=
"ui-grid-a ui-responsive"
>
\n
<div
class=
"ui-block-a"
>
\n
<div
class=
"ui-block-a"
>
\n
<a
class=
"ui-btn"
href=
"#
?
page=sync"
data-i18n=
"Synchronize"
>
Synchronize
</a>
\n
<a
class=
"ui-btn"
href=
"#page=sync"
data-i18n=
"Synchronize"
>
Synchronize
</a>
\n
</div>
\n
</div>
\n
<div
class=
"ui-block-b"
>
\n
<div
class=
"ui-block-b"
>
\n
<a
class=
"ui-btn"
href=
"#
?
page=document_list"
data-i18n=
"Go to document List"
>
Go to document List
</a>
\n
<a
class=
"ui-btn"
href=
"#page=document_list"
data-i18n=
"Go to document List"
>
Go to document List
</a>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
...
@@ -311,7 +311,7 @@
...
@@ -311,7 +311,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.
4378.53544.28347
</string>
</value>
<value>
<string>
946.
59102.20815.50705
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -329,7 +329,7 @@
...
@@ -329,7 +329,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14467
29498.99
</float>
<float>
14467
40955.07
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_dav_configurator_html.xml
View file @
acb5ca18
...
@@ -170,10 +170,10 @@
...
@@ -170,10 +170,10 @@
<div
class=
"ui-controlgroup ui-controlgroup-horizontal"
>
\n
<div
class=
"ui-controlgroup ui-controlgroup-horizontal"
>
\n
<div
class=
"ui-grid-a ui-responsive"
>
\n
<div
class=
"ui-grid-a ui-responsive"
>
\n
<div
class=
"ui-block-a"
>
\n
<div
class=
"ui-block-a"
>
\n
<a
class=
"ui-btn"
href=
"#
?
page=sync"
>
Synchronize
</a>
\n
<a
class=
"ui-btn"
href=
"#page=sync"
>
Synchronize
</a>
\n
</div>
\n
</div>
\n
<div
class=
"ui-block-b"
>
\n
<div
class=
"ui-block-b"
>
\n
<a
class=
"ui-btn"
href=
"#
?
page=document_list"
>
Go to document List
</a>
\n
<a
class=
"ui-btn"
href=
"#page=document_list"
>
Go to document List
</a>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
...
@@ -320,7 +320,7 @@
...
@@ -320,7 +320,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.
4378.53544.28347
</string>
</value>
<value>
<string>
946.
59102.61985.50653
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -338,7 +338,7 @@
...
@@ -338,7 +338,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14467
29536.73
</float>
<float>
14467
41062.96
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_dav_configurator_js.xml
View file @
acb5ca18
...
@@ -188,7 +188,7 @@
...
@@ -188,7 +188,7 @@
var gadget = this;\n
var gadget = this;\n
return gadget.updateHeader({\n
return gadget.updateHeader({\n
title: "Connect To DAV Storage",\n
title: "Connect To DAV Storage",\n
back_url: "#
?
page=jio_configurator",\n
back_url: "#page=jio_configurator",\n
panel_action: false\n
panel_action: false\n
}).push(function () {\n
}).push(function () {\n
return gadget.props.deferred.resolve();\n
return gadget.props.deferred.resolve();\n
...
@@ -355,7 +355,7 @@
...
@@ -355,7 +355,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.5
4860.11845.29678
</string>
</value>
<value>
<string>
946.5
9103.36885.15735
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -373,7 +373,7 @@
...
@@ -373,7 +373,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14467
29573.71
</float>
<float>
14467
41080.69
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_router_js.xml
View file @
acb5ca18
...
@@ -112,23 +112,15 @@
...
@@ -112,23 +112,15 @@
REDIRECT_TIMEOUT = 5000;\n
REDIRECT_TIMEOUT = 5000;\n
\n
\n
function listenHashChange(gadget) {\n
function listenHashChange(gadget) {\n
// Handle hash in this format: #$path1/path2?a=b&c=d\n
function extractHashAndDispatch(evt) {\n
function extractHashAndDispatch(evt) {\n
var hash = (evt.newURL || window.location.toString()).split(\'#\')[1],\n
var hash = (evt.newURL || window.location.toString()).split(\'#\')[1],\n
split,\n
command = "",\n
query = "",\n
subhashes,\n
subhashes,\n
subhash,\n
subhash,\n
keyvalue,\n
keyvalue,\n
index,\n
index,\n
args = {};\n
args = {};\n
if (hash !== undefined) {\n
if (hash !== undefined) {\n
split = hash.split(\'?\');\n
subhashes = hash.split(\'&\');\n
command = split[0] || "";\n
query = split[1] || "";\n
}\n
subhashes = query.split(\'&\');\n
for (index in subhashes) {\n
for (index in subhashes) {\n
if (subhashes.hasOwnProperty(index)) {\n
if (subhashes.hasOwnProperty(index)) {\n
subhash = subhashes[index];\n
subhash = subhashes[index];\n
...
@@ -140,10 +132,9 @@
...
@@ -140,10 +132,9 @@
}\n
}\n
}\n
}\n
}\n
}\n
}\n
\n
\n
return gadget.renderApplication({\n
return gadget.renderApplication({\n
method: command[0],\n
path: command.substr(1),\n
args: args\n
args: args\n
});\n
});\n
\n
\n
...
@@ -167,7 +158,7 @@
...
@@ -167,7 +158,7 @@
})\n
})\n
\n
\n
.declareMethod("getCommandUrlFor", function(options) {\n
.declareMethod("getCommandUrlFor", function(options) {\n
var prefix = \'
?
\',\n
var prefix = \'\',\n
result,\n
result,\n
key;\n
key;\n
result = "#";\n
result = "#";\n
...
@@ -383,7 +374,7 @@
...
@@ -383,7 +374,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.
4378.53544.28347
</string>
</value>
<value>
<string>
946.
59105.23936.34252
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -401,7 +392,7 @@
...
@@ -401,7 +392,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14467
29681.9
</float>
<float>
14467
40807.62
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_application_html.xml
View file @
acb5ca18
...
@@ -182,9 +182,9 @@
...
@@ -182,9 +182,9 @@
<script
class=
"panel-template"
type=
"text/x-handlebars-template"
>
\n
<script
class=
"panel-template"
type=
"text/x-handlebars-template"
>
\n
<div
class=
"ui-content"
>
\n
<div
class=
"ui-content"
>
\n
<ul
data-role=
"listview"
class=
"ui-listview"
>
\n
<ul
data-role=
"listview"
class=
"ui-listview"
>
\n
<li><a
href=
"#
?
page=text_editor_list"
data-i18n=
"Text Documents"
>
Text Documents
</a></li>
\n
<li><a
href=
"#page=text_editor_list"
data-i18n=
"Text Documents"
>
Text Documents
</a></li>
\n
<li><a
href=
"#
?
page=sync"
data-i18n=
"Sync"
>
Sync
</a></li>
\n
<li><a
href=
"#page=sync"
data-i18n=
"Sync"
>
Sync
</a></li>
\n
<li
class=
"ui-last-child"
><a
href=
"#
?
page=logout"
data-i18n=
"Logout"
>
Logout
</a></li>
\n
<li
class=
"ui-last-child"
><a
href=
"#page=logout"
data-i18n=
"Logout"
>
Logout
</a></li>
\n
</ul>
\n
</ul>
\n
</div>
\n
</div>
\n
</script>
\n
</script>
\n
...
@@ -348,7 +348,7 @@
...
@@ -348,7 +348,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.
4378.53544.28347
</string>
</value>
<value>
<string>
946.
59107.19807.14882
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -366,7 +366,7 @@
...
@@ -366,7 +366,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14467
29798.11
</float>
<float>
14467
41174.99
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_application_panel_html.xml
View file @
acb5ca18
...
@@ -140,10 +140,10 @@
...
@@ -140,10 +140,10 @@
<script
id=
"panel-template-body"
type=
"text/x-handlebars-template"
>
\n
<script
id=
"panel-template-body"
type=
"text/x-handlebars-template"
>
\n
<div
class=
"ui-content"
>
\n
<div
class=
"ui-content"
>
\n
<ul
data-role=
"listview"
class=
"ui-listview"
>
\n
<ul
data-role=
"listview"
class=
"ui-listview"
>
\n
<li><a
href=
"#
?
page=text_editor_list"
data-i18n=
"Text Documents"
>
Text Documents
</a></li>
\n
<li><a
href=
"#page=text_editor_list"
data-i18n=
"Text Documents"
>
Text Documents
</a></li>
\n
<li><a
href=
"#
?
page=jio_configurator"
data-i18n=
"Storage Configuration"
>
Storage Configuration
</a></li>
\n
<li><a
href=
"#page=jio_configurator"
data-i18n=
"Storage Configuration"
>
Storage Configuration
</a></li>
\n
<li><a
href=
"#
?
page=sync"
data-i18n=
"Syncronization"
>
Syncronization
</a></li>
\n
<li><a
href=
"#page=sync"
data-i18n=
"Syncronization"
>
Syncronization
</a></li>
\n
<li
class=
"ui-last-child"
><a
href=
"#
?
page=logout"
data-i18n=
"Logout"
>
Logout
</a></li>
\n
<li
class=
"ui-last-child"
><a
href=
"#page=logout"
data-i18n=
"Logout"
>
Logout
</a></li>
\n
</ul>
\n
</ul>
\n
</div>
\n
</div>
\n
</script>
\n
</script>
\n
...
@@ -292,7 +292,7 @@
...
@@ -292,7 +292,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.5
4860.11845.29678
</string>
</value>
<value>
<string>
946.5
9108.30069.37307
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -310,7 +310,7 @@
...
@@ -310,7 +310,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14467
29867.48
</float>
<float>
14467
41155.57
</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