| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.RemoteSearchDriver.js |
| — | — | @@ -35,6 +35,7 @@ |
| 36 | 36 | "mwe-missing_desc_see_source" : "This asset is missing a description. Please see the [$1 original source] and help describe it.", |
| 37 | 37 | "rsd_config_error" : "Add media wizard configuration error: $1", |
| 38 | 38 | "mwe-your_recent_uploads" : "Your recent uploads to $1", |
| | 39 | + "mwe-no_recent_uploads" : "No recent uploads", |
| 39 | 40 | "mwe-upload_a_file" : "Upload a new file to $1", |
| 40 | 41 | "mwe-resource_page_desc" : "Resource page description:", |
| 41 | 42 | "mwe-edit_resource_desc" : "Edit wiki text resource description:", |
| — | — | @@ -849,6 +850,9 @@ |
| 850 | 851 | // Don't submit the form |
| 851 | 852 | return false; |
| 852 | 853 | } ); |
| | 854 | + |
| | 855 | + // Setup base cancel button binding |
| | 856 | + this.onCancelClipEdit(); |
| 853 | 857 | }, |
| 854 | 858 | |
| 855 | 859 | /** |
| — | — | @@ -1015,6 +1019,8 @@ |
| 1016 | 1020 | ); |
| 1017 | 1021 | _this.showResults(); |
| 1018 | 1022 | } ); |
| | 1023 | + }else{ |
| | 1024 | + $j('#upload_bin').empty().text( gM( 'mwe-no_recent_uploads' ) ); |
| 1019 | 1025 | } |
| 1020 | 1026 | |
| 1021 | 1027 | // Deal with the api form upload form directly: |
| — | — | @@ -1776,6 +1782,8 @@ |
| 1777 | 1783 | // Remove preview if its 'on' |
| 1778 | 1784 | $j( '#rsd_preview_display' ).remove(); |
| 1779 | 1785 | |
| | 1786 | + // Remove resource import if present |
| | 1787 | + $j( '#rsd_resource_import' ).remove(); |
| 1780 | 1788 | // Restore the resource container: |
| 1781 | 1789 | this.$resultsContainer.show(); |
| 1782 | 1790 | |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.BaseUploadInterface.js |
| — | — | @@ -723,7 +723,7 @@ |
| 724 | 724 | 'ignorewarnings': 1, |
| 725 | 725 | 'filename': $j( '#wpDestFile' ).val(), |
| 726 | 726 | 'token' : _this.editToken, |
| 727 | | - 'comment' : $j( '#wpUploadDescription' ).val(), |
| | 727 | + 'comment' : $j( '#wpUploadDescription' ).val() |
| 728 | 728 | }; |
| 729 | 729 | //run the upload from stash request |
| 730 | 730 | mw.getJSON(_this.api_url, request, function( data ) { |