Commit 1b796767 authored by Evren Kutar's avatar Evren Kutar

rfix #5215

parent 1e86199b
...@@ -22,7 +22,7 @@ angular.module('ulakbus') ...@@ -22,7 +22,7 @@ angular.module('ulakbus')
} }
if (prtcl === 'ws') { if (prtcl === 'ws') {
rejection.status = rejection.status || rejection.code; rejection.status = rejection.status || rejection.code;
rejection.data = {error: rejection.error}; rejection.data = {error: rejection.error, title: rejection.title};
errorInModal = true; errorInModal = true;
} }
...@@ -62,6 +62,8 @@ angular.module('ulakbus') ...@@ -62,6 +62,8 @@ angular.module('ulakbus')
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>').modal(); '</div>').modal();
// use no_highlight to display pure html
if (!rejection.no_highlight) {
try { try {
$('pre:not(.hljs)').each(function (i, block) { $('pre:not(.hljs)').each(function (i, block) {
hljs.highlightBlock(block); hljs.highlightBlock(block);
...@@ -70,6 +72,7 @@ angular.module('ulakbus') ...@@ -70,6 +72,7 @@ angular.module('ulakbus')
catch (e) { catch (e) {
$log.debug('Exception: ', e.message); $log.debug('Exception: ', e.message);
} }
}
}; };
var errorInAlertBox = function (alertContent) { var errorInAlertBox = function (alertContent) {
......
...@@ -33,7 +33,12 @@ angular.module('ulakbus') ...@@ -33,7 +33,12 @@ angular.module('ulakbus')
var websocket; var websocket;
var refresh_count = 0; var refresh_count = 0;
var refresh_websocket = refresh_count < 5 ? 1000 : 5000; var refresh_websocket = refresh_count < 5 ? 1000 : 5000;
var isSupported = function() {
// return "WebSocket" in window;
return false;
};
var generate_ws = function () { var generate_ws = function () {
if (isSupported()) {
$log.info('Openning web socket...'); $log.info('Openning web socket...');
websocket = new WS(WSUri.url); websocket = new WS(WSUri.url);
websocket.onopen = function (evt) { websocket.onopen = function (evt) {
...@@ -54,6 +59,16 @@ angular.module('ulakbus') ...@@ -54,6 +59,16 @@ angular.module('ulakbus')
websocket.onerror = function (evt) { websocket.onerror = function (evt) {
wsOps.onError(evt) wsOps.onError(evt)
}; };
} else {
var error = {
error: "Tarayıcınız websocket desteklememektedir. Lütfen güncel bir tarayıcı kullanınız.",
code: 500,
title: "Uyumsuz Tarayıcı",
no_highlight: true
};
ErrorService.handle(error, "ws");
}
}; };
var wsOps = {}; var wsOps = {};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment