| Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js |
| — | — | @@ -183,9 +183,8 @@ |
| 184 | 184 | 'comment' : $j('#wpUploadDescription').val() |
| 185 | 185 | } |
| 186 | 186 | //check for editToken |
| 187 | | - _this.etoken = $j("input[name='wpEditToken']").val(); |
| 188 | | - |
| 189 | | - _this.doHttpUpload( httpUpConf ); |
| | 187 | + _this.etoken = $j("input[name='wpEditToken']").val(); |
| | 188 | + _this.doHttpUpload( httpUpConf ); |
| 190 | 189 | }else{ |
| 191 | 190 | js_error( 'Error: unrecongized upload mode: ' + _this.upload_mode ); |
| 192 | 191 | } |
| Index: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js |
| — | — | @@ -675,12 +675,14 @@ |
| 676 | 676 | o+="\t<head>\n"; |
| 677 | 677 | //get transitions |
| 678 | 678 | for(var i in this.plObj.transitions){ |
| 679 | | - var tObj = this.plObj.transitions[i].getAttributeObj(); |
| 680 | | - o+="\t\t<transition "; |
| 681 | | - for(var j in tObj){ |
| 682 | | - o+=' '+j+'="' + tObj[j] + '"\n\t\t'; |
| | 679 | + if( this.plObj.transitions[i] ){ |
| | 680 | + var tObj = this.plObj.transitions[i].getAttributeObj(); |
| | 681 | + o+="\t\t<transition "; |
| | 682 | + for(var j in tObj){ |
| | 683 | + o+=' '+j+'="' + tObj[j] + '"\n\t\t'; |
| | 684 | + } |
| | 685 | + o+='/>'+"\n"; //transitions don't have children |
| 683 | 686 | } |
| 684 | | - o+='/>'+"\n"; //transitions don't have children |
| 685 | 687 | } |
| 686 | 688 | o+="\t</head>\n"; |
| 687 | 689 | |