Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5_fork
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
Eteri
erp5_fork
Commits
ba03ea2c
Commit
ba03ea2c
authored
Nov 06, 2015
by
Vivek
Committed by
Kazuhiko Shiozaki
Nov 06, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_gadget_interface_validator: (fixup) used simpler router logic.
parent
acb5ca18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
24 deletions
+15
-24
bt5/erp5_gadget_interface_validator/PathTemplateItem/web_page_module/gadget_interface_validator_panel_html.xml
...web_page_module/gadget_interface_validator_panel_html.xml
+3
-3
bt5/erp5_gadget_interface_validator/PathTemplateItem/web_page_module/gadget_interface_validator_router_js.xml
.../web_page_module/gadget_interface_validator_router_js.xml
+12
-21
No files found.
bt5/erp5_gadget_interface_validator/PathTemplateItem/web_page_module/gadget_interface_validator_panel_html.xml
View file @
ba03ea2c
...
@@ -140,7 +140,7 @@
...
@@ -140,7 +140,7 @@
<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=form"
data-i18n=
"Interface Validation Form"
>
Interface Validation Form
</a></li>
\n
<li><a
href=
"#page=form"
data-i18n=
"Interface Validation Form"
>
Interface Validation Form
</a></li>
\n
</ul>
\n
</ul>
\n
</div>
\n
</div>
\n
</script>
\n
</script>
\n
...
@@ -289,7 +289,7 @@
...
@@ -289,7 +289,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.
44825.62507.52206
</string>
</value>
<value>
<string>
946.
54879.52570.13994
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -307,7 +307,7 @@
...
@@ -307,7 +307,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1446
476148.07
</float>
<float>
1446
805712.99
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_gadget_interface_validator/PathTemplateItem/web_page_module/gadget_interface_validator_router_js.xml
View file @
ba03ea2c
...
@@ -111,38 +111,29 @@
...
@@ -111,38 +111,29 @@
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
for (index in subhashes) {\n
query = split[1] || "";\n
if (subhashes.hasOwnProperty(index)) {\n
}\n
subhash = subhashes[index];\n
subhashes = query.split(\'&\');\n
if (subhash !== \'\') {\n
for (index in subhashes) {\n
keyvalue = subhash.split(\'=\');\n
if (subhashes.hasOwnProperty(index)) {\n
if (keyvalue.length === 2) {\n
subhash = subhashes[index];\n
args[decodeURIComponent(keyvalue[0])] = decodeURIComponent(keyvalue[1]);\n
if (subhash !== \'\') {\n
}\n
keyvalue = subhash.split(\'=\');\n
if (keyvalue.length === 2) {\n
args[decodeURIComponent(keyvalue[0])] = decodeURIComponent(keyvalue[1]);\n
}\n
}\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
...
@@ -165,7 +156,7 @@
...
@@ -165,7 +156,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
...
@@ -354,7 +345,7 @@
...
@@ -354,7 +345,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.5
4883.25521.1636
6
</string>
</value>
<value>
<string>
946.5
8912.52724.4877
6
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -372,7 +363,7 @@
...
@@ -372,7 +363,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1446
718128.25
</float>
<float>
1446
805302.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