diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 15:38:49 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 15:38:49 +0200 |
| commit | bf1057143cdff8ec289d9d766ab100d64d7ea45d (patch) | |
| tree | 6c35d0d99a72f27a981a07c93f0ecbf600764cd4 /core/js/oc-dialogs.js | |
| parent | 3efe1d3b24e65ed76d521c24b0cfe4e0ff2e7af5 (diff) | |
| parent | 5144d26088b98685a37c73c776a9a47203efa68a (diff) | |
| download | nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.tar.gz nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.zip | |
Merge branch 'master' into routing
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
Diffstat (limited to 'core/js/oc-dialogs.js')
| -rw-r--r-- | core/js/oc-dialogs.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 4dd3c89c14d..2467af61121 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -106,7 +106,7 @@ var OCdialogs = { var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content'; var c_id = '#'+c_name; var d = '<div id="'+c_name+'" title="'+title+'"><select id="dirtree"><option value="0">'+OC.currentUser+'</option></select><div id="filelist"></div><div class="filepicker_loader"><img src="'+OC.filePath('gallery','img','loading.gif')+'"></div></div>'; - if (!modal) modal = false; // Huh..? + if (!modal) modal = false; // Huh.. if (!multiselect) multiselect = false; $('body').append(d); $(c_id + ' #dirtree').focus(function() { @@ -120,7 +120,7 @@ var OCdialogs = { }).data('multiselect', multiselect).data('mimetype',mimetype_filter); // build buttons var b = [{ - text: t('dialogs', 'Choose'), + text: t('core', 'Choose'), click: function(){ if (callback != undefined) { var p; @@ -140,7 +140,7 @@ var OCdialogs = { } }, { - text: t('dialogs', 'Cancel'), + text: t('core', 'Cancel'), click: function(){$(c_id).dialog('close'); }} ]; $(c_id).dialog({width: ((4*$('body').width())/9), height: 400, modal: modal, buttons: b}); @@ -156,11 +156,11 @@ var OCdialogs = { var b = []; switch (buttons) { case OCdialogs.YES_NO_BUTTONS: - b[1] = {text: t('dialogs', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }}; - b[0] = {text: t('dialogs', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}}; + b[1] = {text: t('core', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }}; + b[0] = {text: t('core', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}}; break; case OCdialogs.OK_CANCEL_BUTTONS: - b[1] = {text: t('dialogs', 'Cancel'), click: function(){$(c_id).dialog('close'); }}; + b[1] = {text: t('core', 'Cancel'), click: function(){$(c_id).dialog('close'); }}; case OCdialogs.OK_BUTTON: // fallthrough var f; switch(dialog_type) { @@ -174,7 +174,7 @@ var OCdialogs = { f = function(){OCdialogs.form_ok_handler(callback, c_id)}; break; } - b[0] = {text: t('dialogs', 'Ok'), click: f}; + b[0] = {text: t('core', 'Ok'), click: f}; break; } var possible_height = ($('tr', d).size()+1)*30; |