Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / file_manager / foreground / js / metadata / metadata_cache.js

diff --git a/src/chrome/browser/resources/file_manager/foreground/js/metadata/metadata_cache.js b/src/chrome/browser/resources/file_manager/foreground/js/metadata/metadata_cache.js
index 28e0a55..0a20c17 100644 (file)
--- a/src/chrome/browser/resources/file_manager/foreground/js/metadata/metadata_cache.js
+++ b/src/chrome/browser/resources/file_manager/foreground/js/metadata/metadata_cache.js
@@ -581,7 +581,7 @@ MetadataCache.prototype.mergeProperties_ = function(entry, data) {
   if (data === null) return;
   var properties = this.cache_[entry.toURL()].properties;
   for (var type in data) {
-    if (data.hasOwnProperty(type)) {
+    if (data.hasOwnProperty(type) && !properties.hasOwnProperty(type)) {
       properties[type] = data[type];
       this.notifyObservers_(entry, type);
     }