<!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>[19954] trunk/wp-admin/js/utils.dev.js: Refresh wpCookie, fixes #20078</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, #logmsg > ol { margin-left: 0; 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/19954">19954</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-02-19 23:08:10 +0000 (Sun, 19 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refresh wpCookie, fixes <a href="http://core.trac.wordpress.org/ticket/20078">#20078</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsutilsdevjs">trunk/wp-admin/js/utils.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsutilsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/utils.dev.js (19953 => 19954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/utils.dev.js 2012-02-19 01:54:02 UTC (rev 19953)
+++ trunk/wp-admin/js/utils.dev.js 2012-02-19 23:08:10 UTC (rev 19954)
</span><span class="lines">@@ -3,23 +3,23 @@
</span><span class="cx"> var wpCookies = {
</span><span class="cx"> // The following functions are from Cookie.js class in TinyMCE, Moxiecode, used under LGPL.
</span><span class="cx">
</span><del>- each : function(o, cb, s) {
</del><ins>+ each : function(obj, cb, scope) {
</ins><span class="cx"> var n, l;
</span><span class="cx">
</span><del>- if (!o)
</del><ins>+ if ( !obj )
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- s = s || o;
</del><ins>+ scope = scope || obj;
</ins><span class="cx">
</span><del>- if (typeof(o.length) != 'undefined') {
- for (n=0, l = o.length; n<l; n++) {
- if (cb.call(s, o[n], n, o) === false)
</del><ins>+ if ( typeof(obj.length) != 'undefined' ) {
+ for ( n = 0, l = obj.length; n < l; n++ ) {
+ if ( cb.call(scope, obj[n], n, obj) === false )
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- for (n in o) {
- if (o.hasOwnProperty(n)) {
- if (cb.call(s, o[n], n, o) === false) {
</del><ins>+ for ( n in obj ) {
+ if ( obj.hasOwnProperty(n) ) {
+ if ( cb.call(scope, obj[n], n, obj) === false ) {
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -28,78 +28,108 @@
</span><span class="cx"> return 1;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- getHash : function(n) {
- var v = this.get(n), h;
</del><ins>+ /**
+ * Get a multi-values cookie.
+ * Returns a JS object with the name: 'value' pairs.
+ */
+ getHash : function(name) {
+ var all = this.get(name), ret;
</ins><span class="cx">
</span><del>- if (v) {
- this.each(v.split('&'), function(v) {
- v = v.split('=');
- h = h || {};
- h[v[0]] = v[1];
</del><ins>+ if ( all ) {
+ this.each( all.split('&'), function(pair) {
+ pair = pair.split('=');
+ ret = ret || {};
+ ret[pair[0]] = pair[1];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><del>- return h;
</del><ins>+ return ret;
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- setHash : function(n, v, e, p, d, s) {
- var o = '';
</del><ins>+ /**
+ * Set a multi-values cookie.
+ *
+ * 'values_obj' is the JS object that is stored. It is encoded as URI in wpCookies.set().
+ */
+ setHash : function(name, values_obj, expires, path, domain, secure) {
+ var str = '';
</ins><span class="cx">
</span><del>- this.each(v, function(v, k) {
- o += (!o ? '' : '&') + k + '=' + v;
</del><ins>+ this.each(values_obj, function(val, key) {
+ str += (!str ? '' : '&') + key + '=' + val;
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- this.set(n, o, e, p, d, s);
</del><ins>+ this.set(name, str, expires, path, domain, secure);
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- get : function(n) {
- var c = document.cookie, e, p = n + "=", b;
</del><ins>+ /**
+ * Get a cookie.
+ */
+ get : function(name) {
+ var cookie = document.cookie, e, p = name + "=", b;
</ins><span class="cx">
</span><del>- if (!c)
</del><ins>+ if ( !cookie )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- b = c.indexOf("; " + p);
</del><ins>+ b = cookie.indexOf("; " + p);
</ins><span class="cx">
</span><del>- if (b == -1) {
- b = c.indexOf(p);
</del><ins>+ if ( b == -1 ) {
+ b = cookie.indexOf(p);
</ins><span class="cx">
</span><del>- if (b != 0)
</del><ins>+ if ( b != 0 )
</ins><span class="cx"> return null;
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> b += 2;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- e = c.indexOf(";", b);
</del><ins>+ e = cookie.indexOf(";", b);
</ins><span class="cx">
</span><del>- if (e == -1)
- e = c.length;
</del><ins>+ if ( e == -1 )
+ e = cookie.length;
</ins><span class="cx">
</span><del>- return decodeURIComponent(c.substring(b + p.length, e));
</del><ins>+ return decodeURIComponent( cookie.substring(b + p.length, e) );
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- set : function(n, v, e, p, d, s) {
- document.cookie = n + "=" + encodeURIComponent(v) +
- ((e) ? "; expires=" + e.toGMTString() : "") +
- ((p) ? "; path=" + p : "") +
- ((d) ? "; domain=" + d : "") +
- ((s) ? "; secure" : "");
- },
-
- remove : function(n, p) {
</del><ins>+ /**
+ * Set a cookie.
+ *
+ * The 'expires' arg can be either a JS Date() object set to the expiration date (back-compat)
+ * or the number of seconds until expiration
+ */
+ set : function(name, value, expires, path, domain, secure) {
</ins><span class="cx"> var d = new Date();
</span><span class="cx">
</span><del>- d.setTime(d.getTime() - 1000);
</del><ins>+ if ( typeof(expires) == 'object' && expires.toGMTString ) {
+ expires = expires.toGMTString();
+ } else if ( parseInt(expires, 10) ) {
+ d.setTime( d.getTime() + ( parseInt(expires, 10) * 1000 ) ); // time must be in miliseconds
+ expires = d.toGMTString();
+ } else {
+ expires = '';
+ }
</ins><span class="cx">
</span><del>- this.set(n, '', d, p, d);
</del><ins>+ document.cookie = name + "=" + encodeURIComponent(value) +
+ ((expires) ? "; expires=" + expires : "") +
+ ((path) ? "; path=" + path : "") +
+ ((domain) ? "; domain=" + domain : "") +
+ ((secure) ? "; secure" : "");
+ },
+
+ /**
+ * Remove a cookie.
+ *
+ * This is done by setting it to an empty value and setting the expiration time in the past.
+ */
+ remove : function(name, path) {
+ this.set(name, '', -1000, path);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Returns the value as string. Second arg or empty string is returned when value is not set.
</span><span class="cx"> function getUserSetting( name, def ) {
</span><del>- var o = getAllUserSettings();
</del><ins>+ var obj = getAllUserSettings();
</ins><span class="cx">
</span><del>- if ( o.hasOwnProperty(name) )
- return o[name];
</del><ins>+ if ( obj.hasOwnProperty(name) )
+ return obj[name];
</ins><span class="cx">
</span><span class="cx"> if ( typeof def != 'undefined' )
</span><span class="cx"> return def;
</span><span class="lines">@@ -109,25 +139,22 @@
</span><span class="cx">
</span><span class="cx"> // Both name and value must be only ASCII letters, numbers or underscore
</span><span class="cx"> // and the shorter, the better (cookies can store maximum 4KB). Not suitable to store text.
</span><del>-function setUserSetting( name, value, del ) {
</del><ins>+function setUserSetting( name, value, _del ) {
</ins><span class="cx"> if ( 'object' !== typeof userSettings )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- var c = 'wp-settings-' + userSettings.uid, o = wpCookies.getHash(c) || {}, d = new Date(), p,
</del><ins>+ var cookie = 'wp-settings-' + userSettings.uid, all = wpCookies.getHash(cookie) || {}, path = userSettings.url,
</ins><span class="cx"> n = name.toString().replace(/[^A-Za-z0-9_]/, ''), v = value.toString().replace(/[^A-Za-z0-9_]/, '');
</span><span class="cx">
</span><del>- if ( del ) {
- delete o[n];
</del><ins>+ if ( _del ) {
+ delete all[n];
</ins><span class="cx"> } else {
</span><del>- o[n] = v;
</del><ins>+ all[n] = v;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- d.setTime( d.getTime() + 31536000000 );
- p = userSettings.url;
</del><ins>+ wpCookies.setHash(cookie, all, 31536000, path);
+ wpCookies.set('wp-settings-time-'+userSettings.uid, userSettings.time, 31536000, path);
</ins><span class="cx">
</span><del>- wpCookies.setHash(c, o, d, p);
- wpCookies.set('wp-settings-time-'+userSettings.uid, userSettings.time, d, p);
-
</del><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>