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

Jump to bottom

Hotfix for bookmarks encoding #5

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Hotfix for bookmarks encoding #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/chrome/content/actions.xul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<dialog id="syncplacesOptions"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&sp_title; 5.1.0D"
title="&sp_title; 5.1.0E"
buttons="accept,cancel"
buttonlabelaccept="&options_tab;"
onload="SyncPlacesOptions.onActionLoad();"
Expand Down
12 changes: 10 additions & 2 deletions src/chrome/content/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,11 @@ var SyncPlacesUtils = {
PlacesUtils.tagging.tagURI(SyncPlacesIO.makeURI(node.uri), tags);
}

if (node.charset) PlacesUtils.history.setCharsetForURI(SyncPlacesIO.makeURI(node.uri), node.charset);
if (node.charset) {
if (typeof PlacesUtils.history.setCharsetForURI !== 'undefined')
PlacesUtils.history.setCharsetForURI(SyncPlacesIO.makeURI(node.uri), node.charset);
else PlacesUtils.setCharsetForURI(SyncPlacesIO.makeURI(node.uri), node.charset);
}

if (query) {
searchIds.push(id);
Expand Down Expand Up @@ -848,7 +852,11 @@ var SyncPlacesUtils = {

// last character-set
var uri = PlacesUtils._uri(aPlacesNode.uri);
var lastCharset = PlacesUtils.getCharsetForURI(uri);
var lastCharset;
if (typeof PlacesUtils.history.getCharsetForURI !== 'undefined')
lastCharset = PlacesUtils.history.getCharsetForURI(uri);
else lastCharset = PlacesUtils.getCharsetForURI(uri);

if (lastCharset)
aJSNode.charset = lastCharset;
}
Expand Down
2 changes: 1 addition & 1 deletion src/install.rdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>syncplaces@andyhalford.com</em:id>
<em:name>SyncPlaces</em:name>
<em:version>5.1.0D</em:version>
<em:version>5.1.0E</em:version>

<em:type>2</em:type>
<em:homepageURL>http://www.andyhalford.com/syncplaces/index.html</em:homepageURL>
Expand Down
Binary file added xpi/syncplaces-5.1.0E.xpi
View file
Open in desktop
Binary file not shown.