r51620 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r51619‎ | r51620 | r51621 >
Date:23:31, 8 June 2009
Author:dale
Status:deferred
Tags:
Comment:
fix sequence display of add-media-wiz
Modified paths:
  • /branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js (modified) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/libAddMedia/seqRemoteSearchDriver.js (modified) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js (modified) (history)

Diff [purge]

Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/seqRemoteSearchDriver.js
@@ -5,7 +5,14 @@
66 return this.init( iObj )
77 }
88 seqRemoteSearchDriver.prototype = {
9 - init:function( iObj ){
 9+ init:function( this_seq ){
 10+ //setup remote search driver with a seq parent:
 11+ this.pSeq = this_seq;
 12+ var iObj = {
 13+ 'target_container':'#tab-ic-cliplib',
 14+ 'local_wiki_api_url': this_seq.getLocalApiUrl(),
 15+ 'instance_name': this_seq.instance_name + '.mySearch'
 16+ }
1017 //inherit the remoteSearchDriver properties:n
1118 var tmpRSD = new remoteSearchDriver( iObj );
1219 for(var i in tmpRSD){
@@ -46,7 +53,7 @@
4754 return $j('#clone_'+this.id).get(0);
4855 },
4956 drag:function(e, ui){
50 - insert_key = _this.p_seq.clipDragUpdate(ui, this);
 57+ insert_key = _this.pSeq.clipDragUpdate(ui, this);
5158 },
5259 //do contain:
5360 containment:'#container_track_0',
Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
@@ -481,7 +481,7 @@
482482 js_log('done with encoding do upload:' + _this.editForm.action);
483483 // ignore warnings & set source type
484484 //_this.formData[ 'wpIgnoreWarning' ]='true';
485 - _this.formData[ 'wpSourceType' ]= 'file';
 485+ _this.formData[ 'wpSourceType' ] = 'file';
486486 _this.formData[ 'action' ] = 'submit';
487487
488488 _this.fogg.post( _this.editForm.action, 'wpUploadFile', JSON.stringify( _this.formData ) );
Index: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js
@@ -139,12 +139,7 @@
140140 'remoteSearchDriver',
141141 'seqRemoteSearchDriver'
142142 ], function(){
143 - this_seq.mySearch = new seqRemoteSearchDriver({
144 - 'p_seq':this_seq,
145 - 'target_container':'#cliplib_ic',
146 - 'local_wiki_api_url': this_seq.getLocalApiUrl(),
147 - 'instance_name': this_seq.instance_name + '.mySearch'
148 - });
 143+ this_seq.mySearch = new seqRemoteSearchDriver(this_seq);
149144 this_seq.mySearch.doInitDisplay();
150145 });
151146 }
@@ -550,7 +545,7 @@
551546 '<a id="mv_menu_item_'+tab_id+'" href="#tab-ic-' + tab_id + '">'+gM('menu_' + tab_id )+
552547 '</li>';
553548
554 - tabc += '<div id="tab-ic-' + tab_id + '" >';
 549+ tabc += '<div id="tab-ic-' + tab_id + '" style="overflow:auto;" >';
555550 tabc += (menu_item.html) ? menu_item.html : '<h3>' + gM('menu_'+tab_id) + '</h3>';
556551 tabc +='</div>';
557552

Status & tagging log