mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4

This commit is contained in:
Lukas Reschke 2012-07-02 10:22:33 +02:00
parent 134d5d93c8 8b5cae3c6c
commit 4235ce0b63
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files_sharing/js/share.js
View File

@ -360,7 +360,8 @@ $(document).ready(function() {
$(this).select(); $(this).select();
}); });
$('#emailPrivateLink').live('submit', function() { $('#emailPrivateLink').live('submit', function(event) {
event.preventDefault();
OC.Share.emailPrivateLink(); OC.Share.emailPrivateLink();
}); });
}); });

18
core/js/multiselect.js
View File

@ -35,6 +35,7 @@
} }
button.click(function(event){ button.click(function(event){
var button=$(this); var button=$(this);
if(button.parent().children('ul').length>0){ if(button.parent().children('ul').length>0){
button.parent().children('ul').slideUp(400,function(){ button.parent().children('ul').slideUp(400,function(){
@ -128,19 +129,30 @@
if(event.keyCode == 13) { if(event.keyCode == 13) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
var value = $(this).val();
var exists = false;
$.each(options,function(index, item) {
if ($(item).val() == value) {
exists = true;
return false;
}
});
if (exists) {
return false;
}
var li=$(this).parent(); var li=$(this).parent();
$(this).remove(); $(this).remove();
li.text('+ '+settings.createText); li.text('+ '+settings.createText);
li.before(createItem(this)); li.before(createItem(this));
var select=button.parent().next(); var select=button.parent().next();
var option=$('<option selected="selected"/>'); var option=$('<option selected="selected"/>');
option.attr('value',$(this).val()); option.attr('value',value);
option.text($(this).val()); option.text($(this).val());
select.append(options); select.append(option);
li.prev().children('input').trigger('click'); li.prev().children('input').trigger('click');
button.parent().data('preventHide',false); button.parent().data('preventHide',false);
if(settings.createCallback){ if(settings.createCallback){
settings.createCallback(); settings.createCallback($(this).val());
} }
} }
}); });

2
lib/l10n.php
View File

@ -115,7 +115,7 @@ class OC_L10N{
// (Just no need to define date/time format etc. twice) // (Just no need to define date/time format etc. twice)
if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) { if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
// Include the file, save the data from $CONFIG // Include the file, save the data from $CONFIG
include($i18ndir.$lang.'.php'); include(strip_tags($i18ndir).strip_tags($lang).'.php');
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){ if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
$this->translations = $TRANSLATIONS; $this->translations = $TRANSLATIONS;
} }

9
settings/js/users.js
View File

@ -40,7 +40,15 @@ $(document).ready(function(){
}else{ }else{
checkHandeler=false; checkHandeler=false;
} }
var addGroup = function(group) {
$('select[multiple]').each(function(index, element) {
if ($(element).find('option[value="'+group +'"]').length == 0) {
$(element).append('<option value="'+group+'">'+group+'</option>');
}
})
};
element.multiSelect({ element.multiSelect({
createCallback:addGroup,
createText:'add group', createText:'add group',
checked:checked, checked:checked,
oncheck:checkHandeler, oncheck:checkHandeler,
@ -213,6 +221,5 @@ $(document).ready(function(){
} }
} }
); );
location.reload();
}); });
}); });