| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mv_remote_media_search.js |
| — | — | @@ -39,6 +39,11 @@ |
| 40 | 40 | |
| 41 | 41 | 'enable_uploads':false // if we want to enable an uploads tab: |
| 42 | 42 | } |
| | 43 | +/* licence_templateObj lists all the licence templates and their coresponding icon and short text description */ |
| | 44 | +var licence_templateObj = { |
| | 45 | + |
| | 46 | +} |
| | 47 | + |
| 43 | 48 | var remoteSearchDriver = function(initObj){ |
| 44 | 49 | return this.init( initObj ); |
| 45 | 50 | } |
| — | — | @@ -72,17 +77,18 @@ |
| 73 | 78 | //domain insert: two modes: simple config or domain list: |
| 74 | 79 | @local : if the content provider assets need to be imported or not. |
| 75 | 80 | @local_domains : sets of domains for which the content is local |
| | 81 | + //@@todo should query wgForeignFileRepos setting maybe interwikimap from the api |
| 76 | 82 | */ |
| 77 | 83 | 'this_wiki':{ |
| 78 | | - 'enabled':0, |
| 79 | | - 'checked':0, |
| 80 | | - 'd' :0, |
| 81 | | - 'title' :'This Wiki', |
| 82 | | - 'desc' : '(should be updated with the proper text) maybe import from some config value', |
| | 84 | + 'enabled': 0, |
| | 85 | + 'checked': 0, |
| | 86 | + 'd' : 0, |
| | 87 | + 'title' : 'This Wiki', |
| | 88 | + 'desc' : '(should be updated with the proper text) maybe import from some config value', |
| 83 | 89 | 'api_url': wgServer + wgScriptPath + '/api.php', |
| 84 | | - 'lib' :'mediaWiki', |
| 85 | | - 'local' :true, |
| 86 | | - 'tab_img':false |
| | 90 | + 'lib' : 'mediaWiki', |
| | 91 | + 'local' : true, |
| | 92 | + 'tab_img': false |
| 87 | 93 | }, |
| 88 | 94 | 'wiki_commons':{ |
| 89 | 95 | 'enabled':1, |
| — | — | @@ -1300,7 +1306,11 @@ |
| 1301 | 1307 | if(page.revisions[0]['*'].indexOf('#REDIRECT')===0){ |
| 1302 | 1308 | //skip page is redirect |
| 1303 | 1309 | continue; |
| 1304 | | - } |
| | 1310 | + } |
| | 1311 | + //skip if its an empy or missing imageinfo: |
| | 1312 | + if(!page.imageinfo) |
| | 1313 | + continue; |
| | 1314 | + |
| 1305 | 1315 | this.resultsObj[page_id]={ |
| 1306 | 1316 | 'titleKey' : page.title, |
| 1307 | 1317 | 'link' :page.imageinfo[0].descriptionurl, |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libSequencer/mv_clipedit.js |
| — | — | @@ -324,7 +324,7 @@ |
| 325 | 325 | '<a href="#" class="mv_cancel_img_edit" title="' + getMsg('mv_cancel_image_insert')+'">' + getMsg('mv_cancel_image_insert') + '</a> '); |
| 326 | 326 | //$j('#'+this.control_ct).append( this.getInsertDesc() + this.getInsertAction() ); |
| 327 | 327 | |
| 328 | | - //this.applyInsertControlBindings(); |
| | 328 | + this.applyInsertControlBindings(); |
| 329 | 329 | }, |
| 330 | 330 | setInOutBindings:function(){ |
| 331 | 331 | //setup bindings for adjust / preview: |