Ticket #23263: 23263.3.diff

wp-includes/js/media-models.js

@@ -69 +69 @@
 
         _.extend( media, {
                 /**
-                 * media.template( id )
-                 *
-                 * Fetches a template by id.
-                 *
-                 * @param  {string} id   A string that corresponds to a DOM element with an id prefixed with "tmpl-".
-                 *                       For example, "attachment" maps to "tmpl-attachment".
-                 * @return {function}    A function that lazily-compiles the template requested.
-                 */
-                template: _.memoize( function( id ) {
-                        var compiled,
-                                options = {
-                                        evaluate:    /<#([\s\S]+?)#>/g,
-                                        interpolate: /\{\{\{([\s\S]+?)\}\}\}/g,
-                                        escape:      /\{\{([^\}]+?)\}\}(?!\})/g,
-                                        variable:    'data'
-                                };
-
-                        return function( data ) {
-                                compiled = compiled || _.template( $( '#tmpl-' + id ).html(), null, options );
-                                return compiled( data );
-                        };
-                }),
-
-                /**
                  * media.post( [action], [data] )
                  *
                  * Sends a POST request to WordPress.

wp-includes/js/media-views.js

@@ -1296 +1296 @@
          */
         media.view.MediaFrame = media.view.Frame.extend({
                 className: 'media-frame',
-                template:  media.template('media-frame'),
+                template:  wp.template('media-frame'),
                 regions:   ['menu','title','content','toolbar','router'],
 
                 initialize: function() {
@@ -1898 +1898 @@
          */
         media.view.Modal = media.View.extend({
                 tagName:  'div',
-                template: media.template('media-modal'),
+                template: wp.template('media-modal'),
 
                 attributes: {
                         tabindex: 0
@@ -2082 +2082 @@
         media.view.UploaderWindow = media.View.extend({
                 tagName:   'div',
                 className: 'uploader-window',
-                template:  media.template('uploader-window'),
+                template:  wp.template('uploader-window'),
 
                 initialize: function() {
                         var uploader;
@@ -2150 +2150 @@
         media.view.UploaderInline = media.View.extend({
                 tagName:   'div',
                 className: 'uploader-inline',
-                template:  media.template('uploader-inline'),
+                template:  wp.template('uploader-inline'),
 
                 initialize: function() {
                         _.defaults( this.options, {
@@ -2222 +2222 @@
          */
         media.view.UploaderStatus = media.View.extend({
                 className: 'media-uploader-status',
-                template:  media.template('uploader-status'),
+                template:  wp.template('uploader-status'),
 
                 events: {
                         'click .upload-dismiss-errors': 'dismiss'
@@ -2325 +2325 @@
 
         media.view.UploaderStatusError = media.View.extend({
                 className: 'upload-error',
-                template:  media.template('uploader-status-error')
+                template:  wp.template('uploader-status-error')
         });
 
         /**
@@ -2828 +2828 @@
         media.view.Attachment = media.View.extend({
                 tagName:   'li',
                 className: 'attachment',
-                template:  media.template('attachment'),
+                template:  wp.template('attachment'),
 
                 events: {
                         'click .attachment-preview':      'toggleSelectionHandler',
@@ -3213 +3213 @@
                 tagName:   'ul',
                 className: 'attachments',
 
-                cssTemplate: media.template('attachments-css'),
+                cssTemplate: wp.template('attachments-css'),
 
                 events: {
                         'scroll': 'scroll'
@@ -3769 +3769 @@
         media.view.Selection = media.View.extend({
                 tagName:   'div',
                 className: 'media-selection',
-                template:  media.template('media-selection'),
+                template:  wp.template('media-selection'),
 
                 events: {
                         'click .edit-selection':  'edit',
@@ -3974 +3974 @@
          */
         media.view.Settings.AttachmentDisplay = media.view.Settings.extend({
                 className: 'attachment-display-settings',
-                template:  media.template('attachment-display-settings'),
+                template:  wp.template('attachment-display-settings'),
 
                 initialize: function() {
                         var attachment = this.options.attachment;
@@ -4047 +4047 @@
          */
         media.view.Settings.Gallery = media.view.Settings.extend({
                 className: 'gallery-settings',
-                template:  media.template('gallery-settings')
+                template:  wp.template('gallery-settings')
         });
 
         /**
@@ -4056 +4056 @@
         media.view.Attachment.Details = media.view.Attachment.extend({
                 tagName:   'div',
                 className: 'attachment-details',
-                template:  media.template('attachment-details'),
+                template:  wp.template('attachment-details'),
 
                 events: {
                         'change [data-setting]':          'updateSetting',
@@ -4283 +4283 @@
          */
         media.view.EmbedLink = media.view.Settings.extend({
                 className: 'embed-link-settings',
-                template:  media.template('embed-link-settings')
+                template:  wp.template('embed-link-settings')
         });
 
         /**
@@ -4291 +4291 @@
          */
         media.view.EmbedImage =  media.view.Settings.AttachmentDisplay.extend({
                 className: 'embed-image-settings',
-                template:  media.template('embed-image-settings'),
+                template:  wp.template('embed-image-settings'),
 
                 initialize: function() {
                         media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );

wp-includes/script-loader.php

@@ -270 +270 @@
         $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23');
 
         $scripts->add( 'underscore', '/wp-includes/js/underscore.min.js', array(), '1.4.4', 1 );
-        $scripts->add( 'backbone', '/wp-includes/js/backbone.min.js', array('underscore','jquery'), '0.9.2', 1 );
+        $scripts->add( 'template', "/wp-includes/js/template$suffix.js", array('underscore'), '1.0', 1 );
+        $scripts->add( 'backbone', '/wp-includes/js/backbone.min.js', array('underscore','jquery', 'template'), '0.9.2', 1 );
 
         $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.8', 1 );