Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Fix icon for folders in notification feed
Browse files Browse the repository at this point in the history
Fix some ie8 error, dashboard is still unusable.
  • Loading branch information
cdujeu committed Mar 15, 2014
1 parent 1f7eb1d commit 4ebab98
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions core/src/plugins/access.ajxp_user/class.UserDashboardHome.js
Expand Up @@ -101,6 +101,9 @@ Class.create("UserDashboardHome", AjxpPane, {
var a = new Element('li', {title:obj['alt'],style:'position:relative;'}).update(obj['name']);
notificationElement.insert(a);
var img = obj.pFactory.generateBasePreview(obj.ajxpNode);
if(!img.src && !obj.ajxpNode.isLeaf()){
img.src = window.ajxpResourcesFolder + '/images/mimes/64/folder.png';
}
a.IMAGE_ELEMENT = img;
a.insert({top:img});
obj.pFactory.enrichBasePreview(obj.ajxpNode, a);
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js

Large diffs are not rendered by default.

Expand Up @@ -35,6 +35,7 @@ Class.create("Breadcrumb", {
this.options = options || {};
this.element.update('Files');
this.observerFunc = function(event){
if(!this.element) return;
var newNode = event.memo;
var parts = $H();
if(Object.isString(newNode)){
Expand Down
Expand Up @@ -82,7 +82,7 @@ Class.create("FilesList", SelectableElements, {
this.__currentInstanceIndex = FilesList.staticIndex;

var userLoggedObserver = function(){
if(!ajaxplorer || !ajaxplorer.user) return;
if(!ajaxplorer || !ajaxplorer.user || !this.htmlElement) return;
disp = ajaxplorer.user.getPreference("display");
if(disp && (disp == 'thumb' || disp == 'list' || disp == 'detail')){
if(disp != this._displayMode) this.switchDisplayMode(disp);
Expand Down Expand Up @@ -124,6 +124,7 @@ Class.create("FilesList", SelectableElements, {

}.bind(this);
var componentConfigObserver = function(event){
if(!this.htmlElement) return;
if(event.memo.className == "FilesList"){
var refresh = this.parseComponentConfig(event.memo.classConfig.get('all'));
if(refresh){
Expand Down Expand Up @@ -878,7 +879,7 @@ Class.create("FilesList", SelectableElements, {
this.stopObserving("resize", this.observer);
this.scrollSizeObserver = function(){
window.setTimeout(function(){
if(!this.htmlElement || !this.scrollbar) return;
if(!this.htmlElement || !this.scrollbar || !contentContainer) return;
if(this._displayMode == "list"){
fitHeightToBottom(contentContainer, this.htmlElement);
if(Prototype.Browser.IE){
Expand Down

0 comments on commit 4ebab98

Please sign in to comment.