View | Details | Raw Unified | Return to bug 40939 | Differences between
and this patch

Collapse All | Expand All

(-)umc/app.js (-13 / +1 lines)
 Lines 287-302    Link Here 
287 
					}
 287 
					}
288 
				}
 288 
				}
289 
			}
 289 
			}
290 

              
              
            

            

              291
              
			// if item is link wrap it inside an a element

            

            

              292
              
			if (item.is_link) {

            

            

              293
              
				var a_element = domConstruct.create('a', {

            

            

              294
              
					href: item.url || '/',

            

            

              295
              
					target: '_blank'

            

            

              296
              
				});

            

            

              297
              
				domConstruct.place(div, a_element);

            

            

              298
              
				div = a_element;

            

            

              299
              
			}

            

        

          300
          
			return div;

          290
          
			return div;

        

        

          301
          
		},

          291
          
		},

        

        

          302
          

          292
          

        

  

    

    

       Lines 1474-1482
       
    
  Link Here 
    

  

        

          1474
          
					label: _('Open module'),

          1464
          
					label: _('Open module'),

        

        

          1475
          
					isDefaultAction: true,

          1465
          
					isDefaultAction: true,

        

        

          1476
          
					callback: lang.hitch(this, function(id, item) {

          1466
          
					callback: lang.hitch(this, function(id, item) {

        

          
            

              1477
              
						if (!item.is_link) {


              1467
              
						this.openModule(item);

            

            

              1478
              
							this.openModule(item);


              
              
            

            

              1479
              
						}


            

        

          1480
          
						//this._tabContainer.transition(id, item);

          1468
          
						//this._tabContainer.transition(id, item);

        

        

          1481
          
					})

          1469
          
					})

        

        

          1482
          
				}, {

          1470
          
				}, {

        



(-)umc/widgets/GalleryPane.js
      (-3 / +11 lines)




  

    

    

       Lines 181-186
       
    
  Link Here 
    

  

        

          181
          
				menuItem.set('disabled', disabled);

          181
          
				menuItem.set('disabled', disabled);

        

        

          182
          
				menuItem.set('label', label);

          182
          
				menuItem.set('label', label);

        

        

          183
          
				menuItem.set('iconClass', iconClass);

          183
          
				menuItem.set('iconClass', iconClass);

        

            

              
              
              184
              
				if (item.is_link && action.name === 'open'){

            

            

              185
              
					domStyle.set(menuItem.domNode, "display", "none");

            

            

              186
              
				} else {

            

            

              187
              
					domStyle.set(menuItem.domNode, "display", "");

            

            

              188
              
				}

            

        

          184
          
			}, this);

          189
          
			}, this);

        

        

          185
          

          190
          

        

        

          186
          
			domClass.add(node, 'umcGalleryItemActive');

          191
          
			domClass.add(node, 'umcGalleryItemActive');

        

  

    

    

       Lines 415-428
       
    
  Link Here 
    

  

        

          415
          
			var div = put(wrapperDiv, lang.replace('div.umcGalleryItem', item));

          420
          
			var div = put(wrapperDiv, lang.replace('div.umcGalleryItem', item));

        

        

          416
          
			var description = this.getItemDescription(item);

          421
          
			var description = this.getItemDescription(item);

        

        

          417
          
			var iconClass = this.getIconClass(item);

          422
          
			var iconClass = this.getIconClass(item);

        

            

              
              
              423
              
			if (this._contextMenu) {

            

            

              424
              
				put(div, 'div.umcGalleryContextIcon');

            

            

              425
              
			}

            

            

              426
              
			if (item.is_link) {

            

            

              427
              
				div = put(div, lang.replace('a[href="{link}"][target="_blank"]', {link: item.url}));

            

            

              428
              
			}

            

        

          418
          
			if (iconClass) {

          429
          
			if (iconClass) {

        

        

          419
          
				put(div, 'div.umcGalleryIcon.' + iconClass);

          430
          
				put(div, 'div.umcGalleryIcon.' + iconClass);

        

        

          420
          
			}

          431
          
			}

        

        

          421
          
			put(div, 'div.umcGalleryName', this.getItemName(item));

          432
          
			put(div, 'div.umcGalleryName', this.getItemName(item));

        

        

          422
          
			put(div, 'div.umcGalleryDescription', description);

          433
          
			put(div, 'div.umcGalleryDescription', description);

        

            

              423
              
			if (this._contextMenu) {

              
              
            

            

              424
              
				put(div, 'div.umcGalleryContextIcon');

            

            

              425
              
			}

            

        

          426
          

          434
          

        

        

          427
          
			// create status icon

          435
          
			// create status icon

        

        

          428
          
			var statusIconClass = this.getStatusIconClass(item);

          436
          
			var statusIconClass = this.getStatusIconClass(item);

        






  

  Return to bug 40939