Skip to content
This repository has been archived by the owner on May 15, 2019. It is now read-only.

Commit

Permalink
Merge pull request #7 from kashesandr/master
Browse files Browse the repository at this point in the history
a few small changes, bump the version to 1.2.1
  • Loading branch information
kashesandr authored Jul 18, 2016
2 parents 292ec5f + 9669cb5 commit a41f6ef
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build/components/cic-main/element.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chip-in-calculator",
"version": "1.1.1",
"version": "1.2.1",
"description": "chip in calculator",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/cic-i18n/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Polymer({
},

loadLocales: function(){
clientLocale = (window.navigator.userLanguage || window.navigator.language).slice(0,2);
isKnownLocale = this.knownLocales.indexOf(clientLocale) > -1;
var clientLocale = (window.navigator.userLanguage || window.navigator.language).slice(0,2);
var isKnownLocale = this.knownLocales.indexOf(clientLocale) > -1;
I18nMsg.lang = isKnownLocale ? clientLocale : 'en';
I18nMsg.url = 'locales';
}
Expand Down
6 changes: 1 addition & 5 deletions src/components/cic-router/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ Polymer({
},

getLocation: function(){
var link = '';

link = document.location.href;

return link
return document.location.href;
}

});

0 comments on commit a41f6ef

Please sign in to comment.