Ignore:
Timestamp:
06/16/12 09:54:21 (7 years ago)
Author:
gogo
Message:

Update to latest of
https://github.com/sleemanj/mootools-filemanager

Location:
branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Source/Uploader
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Source/Uploader/Fx.ProgressBar.js

    r1309 r1319  
    3030 
    3131  initialize: function(element, options) { 
    32     this.element = $(element); 
     32    this.element = document.id(element); 
    3333    this.parent(options); 
    3434 
     
    7070    this.element.setStyle('backgroundPosition', css + ' 0px').title = Math.round(to) + '%'; 
    7171 
    72     var text = $(this.options.text); 
     72    var text = document.id(this.options.text); 
    7373    if (text) text.set('text', Math.round(to) + '%'); 
    7474 
  • branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Source/Uploader/Swiff.Uploader.js

    r1309 r1319  
    126126 
    127127    // container options for Swiff class 
    128     this.options.container = this.box = new Element('span', {'class': 'swiff-uploader-box',events: { click: function(e) { e.stopPropagation(); } }}).inject($(this.options.container) || document.body); 
     128    this.options.container = this.box = new Element('span', {'class': 'swiff-uploader-box',events: { click: function(e) { e.stopPropagation(); } }}).inject(document.id(this.options.container) || document.body); 
    129129 
    130130    // target 
    131     this.target = $(this.options.target); 
     131    this.target = document.id(this.options.target); 
    132132    if(this.target) { 
    133133      var scroll = window.getScroll(); 
     
    226226  initializeSwiff: function() { 
    227227    this.appendCookieData();          // looks like there's a bit of trouble with xSetOptions, so we circumvent it by passing it all in one go through xInitialize 
    228         //if (typeof console !== 'undefined' && console.log) console.log('initializeSwiff: data count = ' + this.options.data.length + ' : ' + this.options.data); 
     228        // if (typeof console !== 'undefined' && console.log) console.log('initializeSwiff: data count = ' + this.options.data.length + ' : ' + this.options.data); 
    229229 
    230230    // extracted options for the swf 
     
    259259  reposition: function(coords) { 
    260260    // update coordinates, manual or automatically 
    261     coords = coords || (this.target && this.target.offsetHeight) 
    262       ? this.target.getCoordinates(this.box.getOffsetParent()) 
    263       : {top: window.getScrollTop(), left: 0, width: 40, height: 40}; 
     261    coords = coords || (this.target && this.target.offsetHeight) ? this.target.getCoordinates(this.box.getOffsetParent()) : {top: window.getScrollTop(), left: 0, width: 40, height: 40}; 
    264262    this.box.setStyles(coords); 
    265263    this.fireEvent('reposition', [coords, this.box, this.target]); 
     
    267265 
    268266  setOptions: function(options) { 
    269         //if (typeof console !== 'undefined' && console.log) console.log('Swiff.Uploader: BASE::setOptions'); 
     267        // if (typeof console !== 'undefined' && console.log) console.log('Swiff.Uploader: BASE::setOptions'); 
    270268    if (options) { 
    271269      if (options.url) options.url = Swiff.Uploader.qualifyPath(options.url); 
     
    274272      if (this.loaded) { 
    275273                this.remote('xSetOptions', options); 
    276           } 
     274    } 
    277275    } 
    278276    return this; 
     
    316314  appendCookieData: function() { 
    317315    var append = this.options.appendCookieData; 
    318         //if (typeof console !== 'undefined' && console.log) console.log('appendCookieData: ' + (1 * append) + ' / ' + append); 
     316        // if (typeof console !== 'undefined' && console.log) console.log('appendCookieData: ' + (1 * append) + ' / ' + append); 
    319317    if (!append) return; 
    320318 
     
    323321    document.cookie.split(/;\s*/).each(function(cookie) { 
    324322      cookie = cookie.split('='); 
    325           //if (typeof console !== 'undefined' && console.log) console.log('appendCookieData: cookie: "' + cookie[0] + '"(' + cookie.length + ') = "' + (cookie.length > 1 ? cookie[1] : '???') + '"'); 
     323      //if (typeof console !== 'undefined' && console.log) console.log('appendCookieData: cookie: "' + cookie[0] + '"(' + cookie.length + ') = "' + (cookie.length > 1 ? cookie[1] : '???') + '"'); 
    326324      if (cookie.length == 2) { 
    327325        //hash['\"' + decodeURIComponent(cookie[0]) + '\"'] = decodeURIComponent(cookie[1]);    // allow session IDs such as the ASP.NET ones, which come with a dot, etc. 
     
    331329 
    332330    var data = this.options.data || {}; 
    333     if (typeOf(append) === 'string') { 
    334                 data[append] = hash; 
    335         } 
    336     else { 
    337                 Object.append(data, hash); 
    338         } 
    339  
     331    if (typeOf(append) == 'string') { 
     332      data[append] = hash; 
     333  } else { 
     334    Object.append(data, hash); 
     335  } 
    340336    this.setOptions({data: data}); 
    341337  }, 
     
    484480      if (options.url) { 
    485481                options.url = Swiff.Uploader.qualifyPath(options.url); 
    486           } 
     482    } 
    487483      this.base.remote('xFileSetOptions', this.id, options); 
    488484      this.options = Object.merge(this.base.options, options); 
Note: See TracChangeset for help on using the changeset viewer.