Changeset 1196

Show
Ignore:
Timestamp:
01/11/08 00:21:48 (1 year ago)
Author:
ddavis
Message:

Adjusted the category selector interaction in the upload dialog. Needs styling. BugzID:65213

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/release-27/mt-static/mt.js

    r1193 r1196  
    25002500        if ( element.match( /category/ ) ) { 
    25012501            this.type = "category"; 
    2502             this.list.setOption( "singleSelect", false ); 
     2502            this.listsetOption( "singleSelect", false ); 
    25032503            this.list.setOption( "toggleSelect", true ); 
    25042504        } else { 
    …… 
    25412541     
    25422542    open: function( el ) { 
    2543         this.openingEl = el; 
    2544         DOM.addClassName( el, "hidden" ); 
    2545         var closeEl = el.getAttribute( "mt:close-el" ); 
    2546         if ( closeEl )  
    2547             DOM.removeClassName( closeEl, "hidden" ); 
     2543        if ( el ) { 
     2544           this.openingEl = el; 
     2545           DOM.addClassName( el, "hidden" ); 
     2546           var closeEl = el.getAttribute( "mt:close-el" ); 
     2547           if ( closeEl )  
     2548               DOM.removeClassName( closeEl, "hidden" ); 
     2549        } 
    25482550        DOM.removeClassName( this.element, "hidden" ); 
    25492551        /* hack to keep the broadcast from nuking our list */ 
    …… 
    25602562            DOM.addClassName( el, "hidden" ); 
    25612563        DOM.addClassName( this.element, "hidden" ); 
    2562         DOM.removeClassName( this.openingEl, "hidden" ); 
     2564        if ( this.openingEl ) 
     2565            DOM.removeClassName( this.openingEl, "hidden" ); 
    25632566    }, 
    25642567 
    …… 
    25702573            case "close": 
    25712574                this.removeMovable(); 
    2572                 this.close( this.list.getSelectedIDs() ); 
     2575                this.close(); 
    25732576                break; 
    25742577             
    …… 
    27332736        MT.App.selectedCategoryList = Array.fromPseudo( list.getSelectedIDs() ); 
    27342737        app.catList.redraw(); 
     2738        if ( this.type == 'folder' ) 
     2739            this.close(); 
    27352740    }, 
    27362741 

  • branches/release-27/tmpl/cms/include/asset_upload.tmpl

    r1118 r1196  
    7070            show_hint="1"> 
    7171            <mt:var name="object_type" value="page"> 
    72             <mt:include name="include/category_selector.tmpl"> 
    7372            <script type="text/javascript" src="<$mt:var name="static_uri"$>js/tc/client.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    7473            <script type="text/javascript"> 
    …… 
    117116                        eventClick: function( event ) { 
    118117                            var command = this.getMouseEventCommand( event ); 
     118                            log('command:'+command); 
    119119                            switch( command ) { 
    120120 
    121121                                case "openFolderSelector": 
    122                                     this.categorySelector.open( null, Function.stub, event.commandElement ); 
     122                                    this.categorySelector.open( event.commandElement ); 
    123123                                    break; 
    124  
     124                                 
    125125                            } 
    126126                            return arguments.callee.applySuper( this, arguments ); 
    …… 
    177177 
    178178<mt:if name="enable_destination"> 
    179     <div id="folder-selector" style="position:static;" class="category-selector autolayout-flyout-auto flyout"><div id="folder-selector-inner" class="inner"--> 
    180         <div id="add-category-form" class="add-category-form hidden"><input id="add-category-input" class="add-category-input input-hint" type="text" value="<__trans phrase="Add [lc,_1] name" params="Folder">" mt:default="<__trans phrase="Add [lc,_1] name" params="Folder">" mt:delegate="default-value" /> <a href="javascript:void(0);" mt:command="add" class="add-category-save-link"><span>Add</span>&nbsp;&nbsp;&nbsp;</a><a href="javascript:void(0);" mt:command="cancel" class="add-category-cancel-link"><span>Cancel</span>&nbsp;&nbsp;&nbsp;</a></div> 
    181         <div id="folder-selector-list" class="category-selector-list"> 
    182         </div> 
    183         <a class="add-category-ok-link" href="javascript:void(0)" mt:command="close"><__trans phrase="OK"></a> 
    184     </div></div><!-- /category-selector --> 
     179   <$mt:var name="container_type" value="folder"$> 
     180   <mt:include name="include/category_selector.tmpl"> 
    185181</mt:if> 
    186182