From: John Firebaugh Date: Sat, 17 Aug 2013 19:59:22 +0000 (-0700) Subject: Update to iD 1.1.4 X-Git-Tag: live~5378 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4995714644f422d67ae98f43f54fe20738ee4c95?hp=18c00a5459b20af4d7363a24f708af8408f9bcf9 Update to iD 1.1.4 --- diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 8c00db1c2..6463f2f1c 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -3506,15 +3506,15 @@ img.wiki-image { padding-top: 15px; } -.save-success .osm:before { +.save-success .button.osm:before { background-position: 0px -220px; } -.save-success .twitter:before { +.save-success .button.twitter:before { background-position: -100px -220px; } -.save-success .facebook:before { +.save-success .button.facebook:before { background-position: -200px -220px; } diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js index 9aef5671a..aeb16e7a4 100644 --- a/vendor/assets/iD/iD.js +++ b/vendor/assets/iD/iD.js @@ -15028,12 +15028,19 @@ window.iD = function () { // https://github.com/systemed/iD/issues/772 // http://mathiasbynens.be/notes/localstorage-pattern#comment-9 try { storage = localStorage; } catch (e) {} - storage = storage || {}; + storage = storage || (function() { + var s = {}; + return { + getItem: function(k) { return s[k]; }, + setItem: function(k, v) { s[k] = v; }, + removeItem: function(k) { delete s[k] } + }; + })(); context.storage = function(k, v) { - if (arguments.length === 1) return storage[k]; - else if (v === null) delete storage[k]; - else storage[k] = v; + if (arguments.length === 1) return storage.getItem(k); + else if (v === null) storage.removeItem(k); + else storage.setItem(k, v); }; var history = iD.History(context), @@ -15236,7 +15243,7 @@ window.iD = function () { return d3.rebind(context, dispatch, 'on'); }; -iD.version = '1.1.3'; +iD.version = '1.1.4'; (function() { var detected = {}; @@ -23730,7 +23737,7 @@ iD.ui.Background = function(context) { ['top', [0, -1]], ['right', [-1, 0]], ['bottom', [0, 1]]], - opacityDefault = (context.storage('background-opacity') !== undefined) ? + opacityDefault = (context.storage('background-opacity') != undefined) ? (+context.storage('background-opacity')) : 0.5; function background(selection) { @@ -27753,7 +27760,9 @@ iD.ui.preset.localized = function(field, context) { if (language) value = language[2]; - t[key(d.lang)] = ''; + if (d.lang) { + t[key(d.lang)] = ''; + } if (d.value) { t[key(value)] = d.value;