Ticket #27423: 27423.patch
File 27423.patch, 5.6 KB (added by , 11 years ago) |
---|
-
src/wp-includes/css/media-views.css
525 525 z-index: 150; 526 526 } 527 527 528 .media-frame .media-frame-menu-toggle { 529 position: absolute; 530 top: 0; 531 left: 0; 532 z-index: 200; 533 display: none; 534 text-decoration: none; 535 font-size: 16px; 536 padding: 16px; 537 } 538 539 .media-frame .media-frame-menu-toggle:hover { 540 position: absolute; 541 } 542 528 543 .media-frame-title { 529 544 position: absolute; 530 545 top: 0; … … 2121 2136 } 2122 2137 2123 2138 .media-frame-menu { 2124 width: auto; 2125 bottom: auto; 2126 right: 0; 2127 height: 60px; 2139 top: 30px; 2140 left: 0; 2141 z-index: inherit; 2142 } 2143 2144 .media-frame .media-frame-menu-toggle { 2145 display: block; 2128 2146 } 2129 2147 2130 2148 .media-menu { 2131 border-right: none; 2149 z-index: inherit; 2150 width: 200px; 2132 2151 position: relative; 2133 border-bottom: 1px solid #dddddd;2134 overflow: hidden;2135 2152 padding: 10px 0 10px 10px; 2153 display: none; 2154 border: 1px solid #ccc; 2136 2155 } 2137 2156 2138 .media-menu a { 2139 float: left; 2140 width: 42%; 2141 white-space: nowrap; 2142 text-overflow: ellipsis; 2143 overflow: hidden; 2157 .media-menu.visible { 2158 z-index: 2000; 2159 display: block; 2160 position: fixed; 2161 top: 0; 2162 bottom: 0; 2163 left: 0; 2164 right: 0; 2165 width: auto; 2166 border: none; 2167 padding: 10px 0; 2168 } 2169 2170 .media-menu > a { 2171 padding: 20px; 2172 width: auto !important; 2173 text-align: center; 2174 font-size: 20px; 2144 2175 } 2145 2176 2146 2177 .media-frame-title { … … 2153 2184 font-size: 14px; 2154 2185 } 2155 2186 2187 .image-details .media-frame-menu-toggle { 2188 display: none; 2189 } 2190 2156 2191 .media-frame-toolbar { 2157 2192 position: absolute; 2158 2193 bottom: 0px; … … 2188 2223 display: none; 2189 2224 } 2190 2225 2191 . media-frame-title {2226 .image-details .media-frame-title { 2192 2227 top: 72px; 2193 left: auto;2194 height: auto;2195 2228 } 2196 2229 2197 2230 .media-frame-title h1 { … … 2200 2233 } 2201 2234 2202 2235 .media-frame-router { 2203 top: 84px;2204 2236 left: 0; 2205 2237 } 2206 2238 2207 2239 .media-frame-content { 2208 2240 left: 0; 2209 top: 118px;2210 2241 } 2211 2242 2212 2243 .image-details .media-frame.hide-router .media-frame-content { -
src/wp-includes/js/media-views.js
1748 1748 template: media.template('media-frame'), 1749 1749 regions: ['menu','title','content','toolbar','router'], 1750 1750 1751 events: { 1752 'click a.media-frame-menu-toggle': 'toggleMenu' 1753 }, 1754 1751 1755 /** 1752 1756 * @global wp.Uploader 1753 1757 */ … … 1833 1837 controller: this 1834 1838 }); 1835 1839 }, 1840 1841 toggleMenu: function( event ) { 1842 console.log( 'clicked' ); 1843 event.preventDefault(); 1844 this.$el.find( '.media-menu' ).toggleClass( 'visible' ); 1845 1846 }, 1836 1847 /** 1837 1848 * @param {Object} toolbar 1838 1849 * @this wp.media.controller.Region … … 4464 4475 }); 4465 4476 4466 4477 /** 4467 4468 4469 4470 4471 4472 4473 4474 4478 * wp.media.view.Menu 4479 * 4480 * @constructor 4481 * @augments wp.media.view.PriorityList 4482 * @augments wp.media.View 4483 * @augments wp.Backbone.View 4484 * @augments Backbone.View 4485 */ 4475 4486 media.view.Menu = media.view.PriorityList.extend({ 4476 4487 tagName: 'div', 4477 4488 className: 'media-menu', 4478 4489 property: 'state', 4479 4490 ItemView: media.view.MenuItem, 4480 4491 region: 'menu', 4492 4493 initialize: function( options ) { 4494 media.view.PriorityList.prototype.initialize.apply( this, arguments ); 4495 this.controller = options.controller; 4496 this.listenTo( this.controller, 'deactivate', function() { 4497 this.$el.removeClass( 'visible' ); 4498 } ); 4499 }, 4500 4481 4501 /** 4482 4502 * @param {Object} options 4483 4503 * @param {string} id … … 4641 4661 tagName: 'li', 4642 4662 className: 'attachment', 4643 4663 template: media.template('attachment'), 4664 isTouch: false, 4644 4665 4645 4666 attributes: { 4646 4667 tabIndex: 0, … … 4649 4670 4650 4671 events: { 4651 4672 'click .attachment-preview': 'toggleSelectionHandler', 4673 'touchend .attachment-preview': 'setTouch', 4652 4674 'change [data-setting]': 'updateSetting', 4653 4675 'change [data-setting] input': 'updateSetting', 4654 4676 'change [data-setting] select': 'updateSetting', … … 4763 4785 this.$bar.width( this.model.get('percent') + '%' ); 4764 4786 } 4765 4787 }, 4788 4789 setTouch: function() { 4790 this.isTouch = true; 4791 }, 4792 4766 4793 /** 4767 4794 * @param {Object} event 4768 4795 */ … … 4773 4800 if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) { 4774 4801 return; 4775 4802 } 4803 4776 4804 if ( event.shiftKey ) { 4777 4805 method = 'between'; 4778 4806 } else if ( event.ctrlKey || event.metaKey ) { 4779 4807 method = 'toggle'; 4780 4808 } 4781 4809 4810 if ( this.isTouch ) { 4811 this.isTouch = false; 4812 method = 'add'; 4813 } 4814 4782 4815 this.toggleSelection({ 4783 4816 method: method 4784 4817 }); … … 4827 4860 selection[ this.selected() ? 'remove' : 'add' ]( model ); 4828 4861 selection.single( model ); 4829 4862 return; 4863 } else if ( 'add' === method ) { 4864 selection.add( model ); 4865 selection.single( model ); 4866 return; 4867 4830 4868 } 4831 4869 4832 4870 // Fixes bug that loses focus when selecting a featured image -
src/wp-includes/media-template.php
130 130 </style> 131 131 <![endif]--> 132 132 <script type="text/html" id="tmpl-media-frame"> 133 <a class="media-frame-menu-toggle" href="#">Insert Media<!-- Change this dynamically. --><div class="dashicons dashicons-arrow-down"></div></a> 133 134 <div class="media-frame-menu"></div> 134 135 <div class="media-frame-title"></div> 135 136 <div class="media-frame-router"></div>