summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/css/jquery.ocdialog.css11
-rw-r--r--core/js/jquery.ocdialog.js7
-rw-r--r--core/js/oc-dialogs.js42
3 files changed, 38 insertions, 22 deletions
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index a1221137bc4..93930bf435f 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -31,6 +31,17 @@
margin-top: 10px;
width: 100%;
}
+/* align primary button to right, other buttons to left */
+.oc-dialog-buttonrow.twobuttons button:nth-child(1) {
+ float: left;
+}
+.oc-dialog-buttonrow.twobuttons button:nth-child(2) {
+ float: right;
+}
+
+.oc-dialog-buttonrow.onebutton button {
+ float: right;
+}
.oc-dialog-close {
position:absolute;
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index af32591ce52..e48e3e8df6a 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -111,6 +111,13 @@
var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
this.$buttonrow = $buttonrow.appendTo(this.$dialog);
}
+ if (value.length === 1) {
+ this.$buttonrow.addClass('onebutton');
+ } else if (value.length === 2) {
+ this.$buttonrow.addClass('twobuttons');
+ } else if (value.length === 3) {
+ this.$buttonrow.addClass('threebuttons');
+ }
$.each(value, function(idx, val) {
var $button = $('<button>').text(val.text);
if (val.classes) {
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index a76f9170dc8..9920cc58e23 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -19,7 +19,7 @@
*
*/
-/* global OC, t, alert, $ */
+/* global alert */
/**
* this class to ease the usage of jquery dialogs
@@ -66,7 +66,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
confirm:function(text, title, callback, modal) {
- this.message(
+ return this.message(
text,
title,
'notice',
@@ -86,7 +86,7 @@ var OCdialogs = {
* @param password whether the input should be a password input
*/
prompt: function (text, title, callback, modal, name, password) {
- $.when(this._getMessageTemplate()).then(function ($tmpl) {
+ return $.when(this._getMessageTemplate()).then(function ($tmpl) {
var dialogName = 'oc-dialog-' + OCdialogs.dialogsCounter + '-content';
var dialogId = '#' + dialogName;
var $dlg = $tmpl.octemplate({
@@ -104,8 +104,15 @@ var OCdialogs = {
modal = false;
}
$('body').append($dlg);
- var buttonlist = [
- {
+ var buttonlist = [{
+ text : t('core', 'No'),
+ click: function () {
+ if (callback !== undefined) {
+ callback(false, input.val());
+ }
+ $(dialogId).ocdialog('close');
+ }
+ }, {
text : t('core', 'Yes'),
click : function () {
if (callback !== undefined) {
@@ -114,15 +121,6 @@ var OCdialogs = {
$(dialogId).ocdialog('close');
},
defaultButton: true
- },
- {
- text : t('core', 'No'),
- click: function () {
- if (callback !== undefined) {
- callback(false, input.val());
- }
- $(dialogId).ocdialog('close');
- }
}
];
@@ -237,7 +235,7 @@ var OCdialogs = {
* You better use a wrapper instead ...
*/
message:function(content, title, dialogType, buttons, callback, modal) {
- $.when(this._getMessageTemplate()).then(function($tmpl) {
+ return $.when(this._getMessageTemplate()).then(function($tmpl) {
var dialogName = 'oc-dialog-' + OCdialogs.dialogsCounter + '-content';
var dialogId = '#' + dialogName;
var $dlg = $tmpl.octemplate({
@@ -254,23 +252,23 @@ var OCdialogs = {
switch (buttons) {
case OCdialogs.YES_NO_BUTTONS:
buttonlist = [{
- text: t('core', 'Yes'),
+ text: t('core', 'No'),
click: function(){
if (callback !== undefined) {
- callback(true);
+ callback(false);
}
$(dialogId).ocdialog('close');
- },
- defaultButton: true
+ }
},
{
- text: t('core', 'No'),
+ text: t('core', 'Yes'),
click: function(){
if (callback !== undefined) {
- callback(false);
+ callback(true);
}
$(dialogId).ocdialog('close');
- }
+ },
+ defaultButton: true
}];
break;
case OCdialogs.OK_BUTTON: