Changeset 28062
- Timestamp:
- 04/09/2014 12:57:46 AM (11 years ago)
- Location:
- trunk/src
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/js/theme.js
r28049 r28062 552 552 553 553 this.listenTo( preview, 'preview:close', function() { 554 self.current = self.model 554 self.current = self.model; 555 555 }); 556 556 }, … … 756 756 757 757 render: function() { 758 var data = this.model.toJSON() ,759 self = this; 758 var data = this.model.toJSON(); 759 760 760 this.$el.html( this.html( data ) ); 761 761 -
trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js
r27632 r28062 266 266 267 267 editor.dom.bind( editor.getBody(), 'mousedown mouseup click', function( event ) { 268 var view = getParentView( event.target ); 268 var view = getParentView( event.target ), 269 deselectEventType; 269 270 270 271 // Contain clicks inside the view wrapper 271 272 if ( view ) { 272 273 event.stopPropagation(); 274 275 // Hack to try and keep the block resize handles from appearing. They will show on mousedown and then be removed on mouseup. 276 if ( tinymce.Env.ie <= 10 ) { 277 deselect(); 278 } 279 280 select( view ); 273 281 274 282 if ( event.type === 'click' && ! event.metaKey && ! event.ctrlKey ) { … … 279 287 } 280 288 } 281 select( view );282 289 // Returning false stops the ugly bars from appearing in IE11 and stops the view being selected as a range in FF. 283 290 // Unfortunately, it also inhibits the dragging of views to a new location. 284 291 return false; 285 292 } else { 286 if ( event.type === 'mousedown' ) { 293 294 // Fix issue with deselecting a view in IE8. Without this hack, clicking content above the view wouldn't actually deselect it 295 // and the caret wouldn't be placed at the mouse location 296 if( tinymce.Env.ie <= 8 ) { 297 deselectEventType = 'mouseup'; 298 } else { 299 deselectEventType = 'mousedown'; 300 } 301 302 if ( event.type === deselectEventType ) { 287 303 deselect(); 288 304 } -
trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
r27979 r28062 199 199 left: 0; 200 200 z-index: -1; 201 clip: rect(1px 1px 1px 1px); /* IE7 */ 201 202 clip: rect(1px, 1px, 1px, 1px); 202 203 overflow: hidden; 203 204 outline: 0; 204 width: 100%; 205 padding: 0; 206 border: 0; 207 width: 1px; 208 height: 1px; 205 209 } 206 210 … … 215 219 216 220 .wpview-wrap.selected { 217 background-color: #f2f8ff; /* fallback to old blue */218 221 background-color: rgba(0,0,0,0.1); 222 border-color: rgba(0,0,0,0.3); 223 } 224 225 .ie8 .wpview-wrap.selected, 226 .ie7 .wpview-wrap.selected { 227 background-color: #e5e5e5; 219 228 border-color: #777; 220 border-color: rgba(0,0,0,0.3);221 229 } 222 230 … … 264 272 } 265 273 274 .ie8 .wpview-wrap .toolbar div, 275 .ie7 .wpview-wrap .toolbar div, 276 .ie8 #wp-image-toolbar div, 277 .ie7 #wp-image-toolbar div { 278 display: inline; 279 padding: 0; 280 } 281 282 .ie8 .dashicons-edit, 283 .ie7 .dashicons-edit { 284 background-image: url(images/dashicon-edit.png); 285 } 286 287 .ie8 .dashicons-no-alt, 288 .ie7 .dashicons-no-alt { 289 background-image: url(images/dashicon-no-alt.png); 290 } 291 292 266 293 .wpview-wrap .toolbar div:hover, 267 294 #wp-image-toolbar div:hover { … … 319 346 } 320 347 348 .ie7 .gallery, 349 .ie8 .gallery { 350 margin: auto; 351 } 352 321 353 .gallery-error { 322 354 border: 1px solid #dedede; … … 353 385 } 354 386 387 .ie7 .gallery .gallery-item, 388 .ie8 .gallery .gallery-item { 389 padding: 6px 0; 390 } 391 355 392 .gallery .gallery-caption, 356 393 .gallery .gallery-icon { … … 375 412 } 376 413 414 .ie8 .gallery-columns-3 .gallery-item, 415 .ie7 .gallery-columns-3 .gallery-item { 416 width: 33%; 417 } 418 377 419 .gallery-columns-4 .gallery-item { 378 420 width: 25%; … … 384 426 385 427 .gallery-columns-6 .gallery-item { 386 width: 16.66 7%;428 width: 16.665%; 387 429 } 388 430
Note: See TracChangeset
for help on using the changeset viewer.