Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tiny Tiny RSS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Server
Tiny Tiny RSS
Commits
3188e863
Commit
3188e863
authored
Feb 09, 2017
by
Andrew Dolgov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handle_rpc_json: fix netalert button never appearing on JSON parse error
parent
829d478f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
index.php
index.php
+1
-2
js/tt-rss.js
js/tt-rss.js
+9
-9
No files found.
index.php
View file @
3188e863
...
...
@@ -232,8 +232,7 @@
<button
id=
"net-alert"
dojoType=
"dijit.form.Button"
style=
"display : none"
disabled=
"true"
title=
"
<?php
echo
__
(
"Communication problem with server."
)
?>
"
>
<img
src=
"images/error.png"
/>
<img
src=
"images/error.png"
/>
</button>
<div
dojoType=
"dijit.form.DropDownButton"
>
...
...
js/tt-rss.js
View file @
3188e863
...
...
@@ -994,14 +994,14 @@ function reverseHeadlineOrder() {
}
function
handle_rpc_json
(
transport
,
scheduled_call
)
{
try
{
var
reply
=
JSON
.
parse
(
transport
.
responseText
);
var
netalert_dijit
=
dijit
.
byId
(
"
net-alert
"
);
var
netalert
=
false
;
var
netalert_dijit
=
dijit
.
byId
(
"
net-alert
"
);
var
netalert
=
false
;
if
(
netalert_dijit
)
netalert
=
netalert_dijit
.
domNode
;
if
(
netalert_dijit
)
netalert
=
netalert_dijit
.
domNode
;
try
{
var
reply
=
JSON
.
parse
(
transport
.
responseText
)
;
if
(
reply
)
{
...
...
@@ -1049,18 +1049,18 @@ function handle_rpc_json(transport, scheduled_call) {
if
(
runtime_info
)
parse_runtime_info
(
runtime_info
);
if
(
netalert
)
Element
.
hide
(
netalert
);
if
(
netalert
)
netalert
.
hide
(
);
}
else
{
if
(
netalert
)
Element
.
show
(
netalert
);
netalert
.
show
(
);
else
notify_error
(
"
Communication problem with server.
"
);
}
}
catch
(
e
)
{
if
(
netalert
)
Element
.
show
(
netalert
);
netalert
.
show
(
);
else
notify_error
(
"
Communication problem with server.
"
);
...
...
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