aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/jquery.ocdialog.js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-09-29 20:10:07 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-09-29 20:10:07 +0200
commit2e1e283592e366f7a43a1a405e57520d0be13ff0 (patch)
treea1810af1589d536c7eac5ba4885298ea31af4cb0 /core/js/jquery.ocdialog.js
parent1b59003d6df7ddf97ff71cc651b4fc064f8ebc17 (diff)
parent5462e199d391a1e4c9858bfd8444366a1047fa7f (diff)
downloadnextcloud-server-2e1e283592e366f7a43a1a405e57520d0be13ff0.tar.gz
nextcloud-server-2e1e283592e366f7a43a1a405e57520d0be13ff0.zip
Merge branch 'appframework-master' into activities-api
Conflicts: lib/public/iservercontainer.php
Diffstat (limited to 'core/js/jquery.ocdialog.js')
-rw-r--r--core/js/jquery.ocdialog.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index f1836fd4727..02cd6ac1466 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -103,6 +103,9 @@
}
$.each(value, function(idx, val) {
var $button = $('<button>').text(val.text);
+ if (val.classes) {
+ $button.addClass(val.classes);
+ }
if(val.defaultButton) {
$button.addClass('primary');
self.$defaultButton = $button;