Merge "Revert timezone in timestamp"
This commit is contained in:
@@ -141,7 +141,9 @@ limitations under the License.
|
|||||||
</td>
|
</td>
|
||||||
<td class="cell updated"
|
<td class="cell updated"
|
||||||
hidden$="[[isColumnHidden('Updated', visibleChangeTableColumns)]]">
|
hidden$="[[isColumnHidden('Updated', visibleChangeTableColumns)]]">
|
||||||
<gr-date-formatter date-str="[[change.updated]]"></gr-date-formatter>
|
<gr-date-formatter
|
||||||
|
has-tooltip
|
||||||
|
date-str="[[change.updated]]"></gr-date-formatter>
|
||||||
</td>
|
</td>
|
||||||
<td class="cell size u-monospace"
|
<td class="cell size u-monospace"
|
||||||
hidden$="[[isColumnHidden('Size', visibleChangeTableColumns)]]">
|
hidden$="[[isColumnHidden('Size', visibleChangeTableColumns)]]">
|
||||||
|
|||||||
@@ -99,6 +99,7 @@ limitations under the License.
|
|||||||
<span class="title">Updated</span>
|
<span class="title">Updated</span>
|
||||||
<span class="value">
|
<span class="value">
|
||||||
<gr-date-formatter
|
<gr-date-formatter
|
||||||
|
has-tooltip
|
||||||
date-str="[[change.updated]]"></gr-date-formatter>
|
date-str="[[change.updated]]"></gr-date-formatter>
|
||||||
</span>
|
</span>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -189,7 +189,9 @@ limitations under the License.
|
|||||||
<span class="collapsedContent">[[comment.message]]</span>
|
<span class="collapsedContent">[[comment.message]]</span>
|
||||||
</div>
|
</div>
|
||||||
<a class="date" href$="[[_computeLinkToComment(comment)]]" on-tap="_handleLinkTap">
|
<a class="date" href$="[[_computeLinkToComment(comment)]]" on-tap="_handleLinkTap">
|
||||||
<gr-date-formatter date-str="[[comment.updated]]"></gr-date-formatter>
|
<gr-date-formatter
|
||||||
|
has-tooltip
|
||||||
|
date-str="[[comment.updated]]"></gr-date-formatter>
|
||||||
</a>
|
</a>
|
||||||
<div class="show-hide">
|
<div class="show-hide">
|
||||||
<label class="show-hide">
|
<label class="show-hide">
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ limitations under the License.
|
|||||||
<span class="title">Registered</span>
|
<span class="title">Registered</span>
|
||||||
<span class="value">
|
<span class="value">
|
||||||
<gr-date-formatter
|
<gr-date-formatter
|
||||||
|
has-tooltip
|
||||||
date-str="[[_account.registered_on]]"></gr-date-formatter>
|
date-str="[[_account.registered_on]]"></gr-date-formatter>
|
||||||
</span>
|
</span>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -157,8 +157,8 @@ limitations under the License.
|
|||||||
<select
|
<select
|
||||||
is="gr-select"
|
is="gr-select"
|
||||||
bind-value="{{_localPrefs.time_format}}">
|
bind-value="{{_localPrefs.time_format}}">
|
||||||
<option value="HHMM_12">4:10 PM (PST)</option>
|
<option value="HHMM_12">4:10 PM</option>
|
||||||
<option value="HHMM_24">16:10 (PST)</option>
|
<option value="HHMM_24">16:10</option>
|
||||||
</select>
|
</select>
|
||||||
</span>
|
</span>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -65,10 +65,6 @@
|
|||||||
this._loadPreferences();
|
this._loadPreferences();
|
||||||
},
|
},
|
||||||
|
|
||||||
_getTzString: function() {
|
|
||||||
return ' ' + new Date().toString().split(' ').pop();
|
|
||||||
},
|
|
||||||
|
|
||||||
_getUtcOffsetString: function() {
|
_getUtcOffsetString: function() {
|
||||||
return ' UTC' + moment().format('Z');
|
return ' UTC' + moment().format('Z');
|
||||||
},
|
},
|
||||||
@@ -150,7 +146,7 @@
|
|||||||
var now = new Date();
|
var now = new Date();
|
||||||
var format = TimeFormats.MONTH_DAY_YEAR;
|
var format = TimeFormats.MONTH_DAY_YEAR;
|
||||||
if (this._isWithinDay(now, date)) {
|
if (this._isWithinDay(now, date)) {
|
||||||
return date.format(timeFormat) + this._getTzString();
|
format = timeFormat;
|
||||||
} else if (this._isWithinHalfYear(now, date)) {
|
} else if (this._isWithinHalfYear(now, date)) {
|
||||||
format = TimeFormats.MONTH_DAY;
|
format = TimeFormats.MONTH_DAY;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,7 +82,6 @@ limitations under the License.
|
|||||||
{time_format: 'HHMM_24', relative_date_in_change_table: false}
|
{time_format: 'HHMM_24', relative_date_in_change_table: false}
|
||||||
).then(function() {
|
).then(function() {
|
||||||
element = fixture('basic');
|
element = fixture('basic');
|
||||||
sandbox.stub(element, '_getTzString').returns('');
|
|
||||||
sandbox.stub(element, '_getUtcOffsetString').returns('');
|
sandbox.stub(element, '_getUtcOffsetString').returns('');
|
||||||
return element._loadPreferences();
|
return element._loadPreferences();
|
||||||
});
|
});
|
||||||
@@ -125,7 +124,6 @@ limitations under the License.
|
|||||||
{time_format: 'HHMM_12'}
|
{time_format: 'HHMM_12'}
|
||||||
).then(function() {
|
).then(function() {
|
||||||
element = fixture('basic');
|
element = fixture('basic');
|
||||||
sandbox.stub(element, '_getTzString').returns('');
|
|
||||||
sandbox.stub(element, '_getUtcOffsetString').returns('');
|
sandbox.stub(element, '_getUtcOffsetString').returns('');
|
||||||
return element._loadPreferences();
|
return element._loadPreferences();
|
||||||
});
|
});
|
||||||
@@ -144,7 +142,6 @@ limitations under the License.
|
|||||||
{time_format: 'HHMM_12', relative_date_in_change_table: true}
|
{time_format: 'HHMM_12', relative_date_in_change_table: true}
|
||||||
).then(function() {
|
).then(function() {
|
||||||
element = fixture('basic');
|
element = fixture('basic');
|
||||||
sandbox.stub(element, '_getTzString').returns('');
|
|
||||||
sandbox.stub(element, '_getUtcOffsetString').returns('');
|
sandbox.stub(element, '_getUtcOffsetString').returns('');
|
||||||
return element._loadPreferences();
|
return element._loadPreferences();
|
||||||
});
|
});
|
||||||
@@ -169,7 +166,6 @@ limitations under the License.
|
|||||||
{time_format: 'HHMM_12', relative_date_in_change_table: true}
|
{time_format: 'HHMM_12', relative_date_in_change_table: true}
|
||||||
).then(function() {
|
).then(function() {
|
||||||
element = fixture('basic');
|
element = fixture('basic');
|
||||||
sandbox.stub(element, '_getTzString').returns('');
|
|
||||||
return element._loadPreferences();
|
return element._loadPreferences();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -184,7 +180,6 @@ limitations under the License.
|
|||||||
setup(function() {
|
setup(function() {
|
||||||
return stubRestAPI(null).then(function() {
|
return stubRestAPI(null).then(function() {
|
||||||
element = fixture('basic');
|
element = fixture('basic');
|
||||||
sandbox.stub(element, '_getTzString').returns('');
|
|
||||||
return element._loadPreferences();
|
return element._loadPreferences();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user