From 15605cf636db9ba0764618aac041e159bf843752 Mon Sep 17 00:00:00 2001 From: Evan Theurer Date: Fri, 29 May 2015 16:12:52 +0200 Subject: [PATCH 1/2] Add ability to add custom classes to alertify modal dialog, allowing for unique content from plugin directives. --- static/js/services/alertify.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/static/js/services/alertify.js b/static/js/services/alertify.js index 02e14e88..650b006d 100644 --- a/static/js/services/alertify.js +++ b/static/js/services/alertify.js @@ -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) { }; 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) { 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++); From 07b6293ddc23537457e002edd89534c331f7641c Mon Sep 17 00:00:00 2001 From: Evan Theurer Date: Fri, 29 May 2015 16:28:36 +0200 Subject: [PATCH 2/2] Add unique classes to important alert dialogs to be used for plugin customization. --- static/js/controllers/uicontroller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/controllers/uicontroller.js b/static/js/controllers/uicontroller.js index 2d927f4e..7bab0756 100644 --- a/static/js/controllers/uicontroller.js +++ b/static/js/controllers/uicontroller.js @@ -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) {