Browse Source

Merge 07b6293ddc into 2a8fc4719b

pull/212/merge
theurere 11 years ago
parent
commit
65cee0a8fe
  1. 4
      static/js/controllers/uicontroller.js
  2. 23
      static/js/services/alertify.js

4
static/js/controllers/uicontroller.js

@ -709,12 +709,12 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web @@ -709,12 +709,12 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web
_.defer(function() {
if (!Modernizr.websockets) {
alertify.dialog.alert(translation._("Your browser is not supported. Please upgrade to a current version."));
alertify.dialog.alert(translation._("Your browser is not supported. Please upgrade to a current version."), null, null, 'unsupportedBrowserPleaseUpgrade');
$scope.setStatus("unsupported");
return;
}
if (!$window.webrtcDetectedVersion) {
alertify.dialog.alert(translation._("Your browser does not support WebRTC. No calls possible."));
alertify.dialog.alert(translation._("Your browser does not support WebRTC. No calls possible."), null, null, 'webrtcUnsupportedBrowserNoCalls');
return;
}
if (mediaStream.config.Renegotiation && $window.webrtcDetectedBrowser === "firefox" && $window.webrtcDetectedVersion < 38) {

23
static/js/services/alertify.js

@ -79,8 +79,9 @@ define(["angular"], function(angular) { @@ -79,8 +79,9 @@ define(["angular"], function(angular) {
defaultMessages: defaultMessages
};
var setupModal = function(data, type) {
var setupModal = function(data, type, classes) {
return $modal.open({
windowClass: classes ? classes : '',
templateUrl: '/dialogs/' + type +'.html',
controller: modalController,
resolve: {
@ -90,7 +91,7 @@ define(["angular"], function(angular) { @@ -90,7 +91,7 @@ define(["angular"], function(angular) {
};
var dialog = {
exec: function(n, title, message, ok_cb, err_cb) {
exec: function(n, title, message, ok_cb, err_cb, classes) {
if (!message && title) {
message = title;
title = null;
@ -98,25 +99,25 @@ define(["angular"], function(angular) { @@ -98,25 +99,25 @@ define(["angular"], function(angular) {
if (!title) {
title = api.defaultMessages[n] || n;
}
var dlg = setupModal({'header': title, 'message': message}, n);
var dlg = setupModal({'header': title, 'message': message}, n, classes);
if (ok_cb) {
dlg.result.then(ok_cb, err_cb);
}
return dlg;
},
error: function(title, message, ok_cb, err_cb) {
return dialog.exec("error", title, message, ok_cb, err_cb);
error: function(title, message, ok_cb, err_cb, classes) {
return dialog.exec("error", title, message, ok_cb, err_cb, classes);
},
notify: function(title, message, ok_cb, err_cb) {
return dialog.exec("notify", title, message, ok_cb, err_cb);
notify: function(title, message, ok_cb, err_cb, classes) {
return dialog.exec("notify", title, message, ok_cb, err_cb, classes);
},
alert: function(message, ok_cb, title) {
alert: function(message, ok_cb, title, classes) {
// Legacy function for compatibility with alertify.
return dialog.notify(title, message, ok_cb);
return dialog.notify(title, message, ok_cb, null, classes);
},
confirm: function(message, ok_cb, err_cb, title) {
confirm: function(message, ok_cb, err_cb, title, classes) {
// Legacy function for compatibility with alertify.
return dialog.exec("confirm", null, message, ok_cb, err_cb);
return dialog.exec("confirm", null, message, ok_cb, err_cb, classes);
},
prompt: function(title, ok_cb, err_cb) {
var id = "allertifyPrompt" + (promptIdx++);

Loading…
Cancel
Save