<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26131] trunk/src/wp-includes/js/svg-painter.js: Clean up the new svg-painter.js so that it passes our jshint; see #25858.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26131">26131</a></dd>
<dt>Author</dt> <dd>iammattthomas</dd>
<dt>Date</dt> <dd>2013-11-13 15:25:20 +0000 (Wed, 13 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up the new svg-painter.js so that it passes our jshint; see <a href="http://core.trac.wordpress.org/ticket/25858">#25858</a>. Props jorbin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjssvgpainterjs">trunk/src/wp-includes/js/svg-painter.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjssvgpainterjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/svg-painter.js (26130 => 26131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/svg-painter.js 2013-11-13 14:00:59 UTC (rev 26130)
+++ trunk/src/wp-includes/js/svg-painter.js 2013-11-13 15:25:20 UTC (rev 26131)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><del>-;var svgPainter = ( function( $, window, document, undefined ) {
</del><ins>+/* global mp6_color_scheme:true */
+var svgPainter = ( function( $, window, document, undefined ) {
</ins><span class="cx">
</span><span class="cx"> 'use strict';
</span><span class="cx">
</span><span class="lines">@@ -30,7 +31,7 @@
</span><span class="cx"> setColors : function( colors ) {
</span><span class="cx">
</span><span class="cx"> if ( typeof colors === 'undefined' && typeof mp6_color_scheme !== 'undefined' ) {
</span><del>- var colors = mp6_color_scheme;
</del><ins>+ colors = mp6_color_scheme;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.colorscheme = colors;
</span><span class="lines">@@ -86,19 +87,20 @@
</span><span class="cx"> if ( ! color.match( /^(#[0-9a-f]{3}|#[0-9a-f]{6})$/i ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var xml = $element.data( 'mp6-svg-' + color );
</del><ins>+ var xml = $element.data( 'mp6-svg-' + color ),
+ base64;
</ins><span class="cx">
</span><span class="cx"> if ( ! xml ) {
</span><span class="cx">
</span><del>- var base64 = $element.css( 'background-image' ).match( /.+data:image\/svg\+xml;base64,(.+)\)/ );
</del><ins>+ base64 = $element.css( 'background-image' ).match( /.+data:image\/svg\+xml;base64,(.+)\)/ );
</ins><span class="cx">
</span><span class="cx"> if ( ! base64 )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- var xml = window.atob( base64[1] );
</del><ins>+ xml = window.atob( base64[1] );
</ins><span class="cx"> } catch ( e ) {
</span><del>- var xml = $.base64.atob( base64[1] );
</del><ins>+ xml = $.base64.atob( base64[1] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // replace `fill` attributes
</span><span class="lines">@@ -120,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $element.attr( 'style', "background-image: url('data:image/svg+xml;base64," + xml + "') !important;" );
</del><ins>+ $element.attr( 'style', 'background-image: url("data:image/svg+xml;base64,' + xml + '") !important;' );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,14 +143,15 @@
</span><span class="cx"> **/
</span><span class="cx"> ;(function($) {
</span><span class="cx">
</span><del>- var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
</del><ins>+ var b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
</ins><span class="cx"> a256 = '',
</span><span class="cx"> r64 = [256],
</span><span class="cx"> r256 = [256],
</span><del>- i = 0;
</del><ins>+ i = 0,
+ c, Plugin;
</ins><span class="cx">
</span><span class="cx"> while(i < 256) {
</span><del>- var c = String.fromCharCode(i);
</del><ins>+ c = String.fromCharCode(i);
</ins><span class="cx"> a256 += c;
</span><span class="cx"> r256[i] = i;
</span><span class="cx"> r64[i] = b64.indexOf(c);
</span><span class="lines">@@ -161,10 +164,11 @@
</span><span class="cx"> i = 0,
</span><span class="cx"> length = s.length,
</span><span class="cx"> result = '',
</span><del>- bitsInBuffer = 0;
</del><ins>+ bitsInBuffer = 0,
+ tmp;
</ins><span class="cx">
</span><span class="cx"> while(i < length) {
</span><del>- var c = s.charCodeAt(i);
</del><ins>+ c = s.charCodeAt(i);
</ins><span class="cx"> c = c < 256 ? alpha[c] : -1;
</span><span class="cx">
</span><span class="cx"> buffer = (buffer << w1) + c;
</span><span class="lines">@@ -172,7 +176,7 @@
</span><span class="cx">
</span><span class="cx"> while(bitsInBuffer >= w2) {
</span><span class="cx"> bitsInBuffer -= w2;
</span><del>- var tmp = buffer >> bitsInBuffer;
</del><ins>+ tmp = buffer >> bitsInBuffer;
</ins><span class="cx"> result += beta.charAt(tmp);
</span><span class="cx"> buffer ^= tmp << bitsInBuffer;
</span><span class="cx"> }
</span><span class="lines">@@ -182,7 +186,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var Plugin = $.base64 = function(dir, input, encode) {
</del><ins>+ Plugin = $.base64 = function(dir, input, encode) {
</ins><span class="cx"> return input ? Plugin[dir](input, encode) : dir ? null : this;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -191,8 +195,8 @@
</span><span class="cx"> return plain + '===='.slice((plain.length % 4) || 4);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- $.base64.atob = function(coded, utf8decode) {
- coded = coded.replace(/[^A-Za-z0-9\+\/\=]/g, "");
</del><ins>+ $.base64.atob = function(coded) {
+ coded = coded.replace(/[^A-Za-z0-9\+\/\=]/g, '');
</ins><span class="cx"> coded = String(coded).split('=');
</span><span class="cx"> var i = coded.length;
</span><span class="cx"> do {--i;
</span></span></pre>
</div>
</div>
</body>
</html>