← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to views/help-page.twig

  • Committer: GitHub
  • Author(s): Dan Garner
  • Date: 2018-06-20 16:27:37 UTC
  • mfrom: (652)
  • mto: This revision was merged to the branch mainline in revision 653.
  • Revision ID: git-v1:1a1ca01506202d782ed245fa27b6ce6c32f0a216
Merge branch 'release18' into bugfix/1.8.10-pack2

Show diffs side-by-side

added added

removed removed

Lines of Context:
views/help-page.twig
60
60
                    url: "{{ urlFor("user.pref") }}?preference=helpGrid",
61
61
                    dataType: 'json',
62
62
                    success: function (json) {
63
 
                        if (json.success)
64
 
                            data = JSON.parse(json.data.value);
 
63
                        try {
 
64
                            if (json.success) {
 
65
                                data = JSON.parse(json.data.value);
 
66
                            }
 
67
                        } catch (e) {
 
68
                            // Do nothing
 
69
                        }
65
70
                    }
66
71
                });
67
72
                return data;