| Index: branches/MwEmbedStandAlone/modules/MiroSubs/mw.MiroSubsConfig.js |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | |
| 3 | | -// include all our module messages |
| | 3 | +// include all module messages |
| 4 | 4 | mw.includeAllModuleMessages(); |
| 5 | 5 | |
| 6 | 6 | /** |
| Index: branches/MwEmbedStandAlone/modules/AddMedia/mw.RemoteSearchDriver.js |
| — | — | @@ -2342,8 +2342,8 @@ |
| 2343 | 2343 | |
| 2344 | 2344 | // Add libraries resizable and hoverIntent to support video edit tools |
| 2345 | 2345 | var librarySet = [ |
| 2346 | | - 'mw.ClipEdit', |
| 2347 | | - 'mw.style.ClipEdit', |
| | 2346 | + 'mw.ClipEdit', |
| | 2347 | + 'mw.style.ClipEdit', |
| 2348 | 2348 | '$j.ui.resizable' |
| 2349 | 2349 | ]; |
| 2350 | 2350 | mw.load( librarySet, function() { |
| Index: branches/MwEmbedStandAlone/modules/ClipEdit/mw.ClipEdit.js |
| — | — | @@ -2,37 +2,8 @@ |
| 3 | 3 | * mw.ClipEdit handles the edit interfaces for images and video |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | | -// set gMsg object: |
| 7 | | -mw.addMessages( { |
| 8 | | - "mwe-clipedit-crop" : "Crop image", |
| 9 | | - "mwe-clipedit-apply_crop" : "Apply crop to image", |
| 10 | | - "mwe-clipedit-reset_crop" : "Reset crop", |
| 11 | | - "mwe-clipedit-insert_image_page" : "Insert into page", |
| 12 | | - "mwe-clipedit-insert_into_sequence" : "Insert into sequence", |
| 13 | | - "mwe-clipedit-preview_insert" : "Preview insert", |
| 14 | | - "mwe-clipedit-cancel_image_insert" : "Cancel insert", |
| 15 | | - "mwe-clipedit-sc_attributes" : "Clip detail edit", |
| 16 | | - "mwe-clipedit-sc_inoutpoints" : "Set in-out points", |
| 17 | | - "mwe-clipedit-sc_overlays" : "Overlays", |
| 18 | | - "mwe-clipedit-sc_audio" : "Audio control", |
| 19 | | - "mwe-clipedit-sc_duration" : "Duration", |
| 20 | | - "mwe-clipedit-template_properties" : "Template properties", |
| 21 | | - "mwe-clipedit-custom_title" : "Custom title", |
| 22 | | - "mwe-clipedit-edit_properties" : "Edit properties", |
| 23 | | - "mwe-clipedit-other_properties" : "Other properties", |
| 24 | | - "mwe-clipedit-resource_page" : "Resource page:", |
| 25 | | - "mwe-clipedit-set_in_out_points" : "Set in-out points", |
| 26 | | - "mwe-clipedit-start_time" : "Start time", |
| 27 | | - "mwe-clipedit-end_time" : "End time", |
| 28 | | - "mwe-clipedit-preview_inout" : "Preview in-out points", |
| 29 | | - "mwe-clipedit-edit-tools" : "Edit tools", |
| 30 | | - "mwe-clipedit-inline-description" : "Caption", |
| 31 | | - "mwe-clipedit-edit-video-tools" : "Edit video tools:", |
| 32 | | - "mwe-clipedit-duration" : "Duration:", |
| 33 | | - "mwe-clipedit-layout" : "Layout", |
| 34 | | - "mwe-clipedit-layout_right" : "Right side image layout", |
| 35 | | - "mwe-clipedit-layout_left" : "Left side image layout" |
| 36 | | -} ); |
| | 6 | +// include all module messages |
| | 7 | +mw.includeAllModuleMessages(); |
| 37 | 8 | |
| 38 | 9 | /** |
| 39 | 10 | * The default clipEdit values |
| Index: branches/MwEmbedStandAlone/libraries/jquery/jquery.ui/ui/jquery.ui.core.js |
| — | — | @@ -13,7 +13,7 @@ |
| 14 | 14 | // this is only a problem because we proxy existing functions |
| 15 | 15 | // and we don't want to double proxy them |
| 16 | 16 | $.ui = $.ui || {}; |
| 17 | | -if ( $.ui.version ) { |
| | 17 | +if ( $.ui.version == "1.8.4") { |
| 18 | 18 | return; |
| 19 | 19 | } |
| 20 | 20 | |
| Index: branches/MwEmbedStandAlone/remotes/mediaWiki.js |
| — | — | @@ -80,6 +80,7 @@ |
| 81 | 81 | |
| 82 | 82 | |
| 83 | 83 | |
| | 84 | + |
| 84 | 85 | // Use wikibits onLoad hook: ( since we don't have js2 / mw object loaded ) |
| 85 | 86 | if( window.jQuery ){ |
| 86 | 87 | jQuery( document ).ready( doPageSpecificRewrite ); |
| — | — | @@ -113,11 +114,16 @@ |
| 114 | 115 | '$j.ui', |
| 115 | 116 | '$j.widget', |
| 116 | 117 | '$j.ui.mouse', |
| 117 | | - '$j.ui.sortable' |
| | 118 | + '$j.ui.position', |
| | 119 | + '$j.ui.progressbar', |
| | 120 | + '$j.ui.dialog', |
| | 121 | + '$j.ui.draggable', |
| | 122 | + '$j.ui.sortable', |
| | 123 | + '$j.ui.datepicker' |
| 118 | 124 | ], function() { |
| 119 | 125 | mw.load( mwEmbedHostPath + '/remotes/AddMediaWizardEditPage.js?' + mwGetReqArgs() ); |
| 120 | 126 | } ); |
| 121 | | - },100); |
| | 127 | + },200); |
| 122 | 128 | return ; |
| 123 | 129 | } |
| 124 | 130 | } |
| — | — | @@ -641,7 +647,7 @@ |
| 642 | 648 | importScriptURI( mwEmbedHostPath + '/libraries/jquery/jquery-1.4.2.js?' + mwGetReqArgs() ); |
| 643 | 649 | } |
| 644 | 650 | setTimeout( waitForJQueryUpgrade, 5); |
| 645 | | - } else { |
| | 651 | + } else { |
| 646 | 652 | // load mwEmbed js |
| 647 | 653 | importScriptURI( mwEmbedHostPath + '/mwEmbed.js?' + mwGetReqArgs() ); |
| 648 | 654 | waitMwEmbedReady( function(){ |