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

Merge pull request #4473 from owncloud/texteditor_polishing 

Texteditor polishing
This commit is contained in:
Jörn Friedrich Dreyer 2013-09-03 05:38:59 -07:00
parent fe0b8ac2c0 449fe8c75e
commit 85758f3d7d
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/templates/index.php
View File

@ -104,7 +104,7 @@
<?php print_unescaped($_['fileList']); ?>
</tbody>
</table>
<div id="editor"></div>
<div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
<div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
<p>
<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>

49
core/js/js.js
View File

@ -431,9 +431,16 @@ OC.Notification={
OC.Breadcrumb={
container:null,
crumbs:[],
show:function(dir, leafname, leaflink){
OC.Breadcrumb.clear();
if(!this.container){//default
this.container=$('#controls');
}
this._show(this.container, dir, leafname, leaflink);
},
_show:function(container, dir, leafname, leaflink){
var self = this;
this._clear(container);
// show home + path in subdirectories
if (dir && dir !== '/') {
@ -450,8 +457,7 @@ OC.Breadcrumb={
crumbImg.attr('src',OC.imagePath('core','places/home'));
crumbLink.append(crumbImg);
crumb.append(crumbLink);
OC.Breadcrumb.container.prepend(crumb);
OC.Breadcrumb.crumbs.push(crumb);
container.prepend(crumb);
//add path parts
var segments = dir.split('/');
@ -460,20 +466,23 @@ OC.Breadcrumb={
if (name !== '') {
pathurl = pathurl+'/'+name;
var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl);
OC.Breadcrumb.push(name, link);
self._push(container, name, link);
}
});
}
//add leafname
if (leafname && leaflink) {
OC.Breadcrumb.push(leafname, leaflink);
this._push(container, leafname, leaflink);
}
},
push:function(name, link){
if(!OC.Breadcrumb.container){//default
OC.Breadcrumb.container=$('#controls');
if(!this.container){//default
this.container=$('#controls');
}
return this._push(OC.Breadcrumb.container, name, link);
},
_push:function(container, name, link){
var crumb=$('<div/>');
crumb.addClass('crumb').addClass('last');
@ -482,30 +491,30 @@ OC.Breadcrumb={
crumbLink.text(name);
crumb.append(crumbLink);
var existing=OC.Breadcrumb.container.find('div.crumb');
var existing=container.find('div.crumb');
if(existing.length){
existing.removeClass('last');
existing.last().after(crumb);
}else{
OC.Breadcrumb.container.prepend(crumb);
container.prepend(crumb);
}
OC.Breadcrumb.crumbs.push(crumb);
return crumb;
},
pop:function(){
if(!OC.Breadcrumb.container){//default
OC.Breadcrumb.container=$('#controls');
if(!this.container){//default
this.container=$('#controls');
}
OC.Breadcrumb.container.find('div.crumb').last().remove();
OC.Breadcrumb.container.find('div.crumb').last().addClass('last');
OC.Breadcrumb.crumbs.pop();
this.container.find('div.crumb').last().remove();
this.container.find('div.crumb').last().addClass('last');
},
clear:function(){
if(!OC.Breadcrumb.container){//default
OC.Breadcrumb.container=$('#controls');
if(!this.container){//default
this.container=$('#controls');
}
OC.Breadcrumb.container.find('div.crumb').remove();
OC.Breadcrumb.crumbs=[];
this._clear(this.container);
},
_clear:function(container) {
container.find('div.crumb').remove();
}
};