Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed basic XHTML problems. #801

Merged
merged 2 commits into from
Jul 13, 2012
Merged

Fixed basic XHTML problems. #801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2248fb2
Fixed basic XHTML problems.
Jul 12, 2012
39ba367
This reverts to commit bd1510cec485ae3dc9b215ca6ea4ef6cf4d65fbf.
Jul 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixed basic XHTML problems.
  • Loading branch information
Lars Knickrehm committed Jul 12, 2012
commit 2248fb2d53ac492faf5b004411ed1ba0d03ad93a
18 changes: 11 additions & 7 deletions dist/leaflet-src.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3012,7 +3012,7 @@ L.Popup = L.Class.extend({
if (this.options.closeButton) {
closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);
closeButton.href = '#close';
closeButton.innerHTML = '×';
closeButton.innerHTML = '×';

L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
}
Expand Down Expand Up @@ -3706,13 +3706,17 @@ L.Path.include({
*/

L.Browser.vml = (function () {
var div = document.createElement('div');
div.innerHTML = '<v:shape adj="1"/>';
try {
var div = document.createElement('div');
div.innerHTML = '<v:shape adj="1"/>';

var shape = div.firstChild;
shape.style.behavior = 'url(#default#VML)';
var shape = div.firstChild;
shape.style.behavior = 'url(#default#VML)';

return shape && (typeof shape.adj === 'object');
return shape && (typeof shape.adj === 'object');
} catch (e) {
return false;
}
}());

L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
Expand Down Expand Up @@ -6234,7 +6238,7 @@ L.Control.Attribution = L.Control.extend({
prefixAndAttribs.push(attribs.join(', '));
}

this._container.innerHTML = prefixAndAttribs.join(' &mdash; ');
this._container.innerHTML = prefixAndAttribs.join(' &#8212; ');
},

_onLayerAdd: function (e) {
Expand Down
2 changes: 1 addition & 1 deletion dist/leaflet.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/control/Control.Attribution.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ L.Control.Attribution = L.Control.extend({
prefixAndAttribs.push(attribs.join(', '));
}

this._container.innerHTML = prefixAndAttribs.join(' &mdash; ');
this._container.innerHTML = prefixAndAttribs.join(' &#8212; ');
},

_onLayerAdd: function (e) {
Expand Down
2 changes: 1 addition & 1 deletion src/layer/Popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ L.Popup = L.Class.extend({
if (this.options.closeButton) {
closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);
closeButton.href = '#close';
closeButton.innerHTML = '&times;';
closeButton.innerHTML = '&#215;';

L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
}
Expand Down
14 changes: 9 additions & 5 deletions src/layer/vector/Path.VML.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
*/

L.Browser.vml = (function () {
var div = document.createElement('div');
div.innerHTML = '<v:shape adj="1"/>';
try {
var div = document.createElement('div');
div.innerHTML = '<v:shape adj="1"/>';

var shape = div.firstChild;
shape.style.behavior = 'url(#default#VML)';
var shape = div.firstChild;
shape.style.behavior = 'url(#default#VML)';

return shape && (typeof shape.adj === 'object');
return shape && (typeof shape.adj === 'object');
} catch (e) {
return false;
}
}());

L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
Expand Down