Skip to content

Commit

Permalink
Updated Spin.js to use Bower
Browse files Browse the repository at this point in the history
Addressing #13. Also updated NPM packages to latest
and fixed minor JSLint error in options.js.
  • Loading branch information
Shane Church authored and Muffo committed Oct 29, 2016
1 parent 475d69e commit 548bf73
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions app/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "__MSG_appName__",
"version": "0.8.0",
"version": "0.8.1",
"manifest_version": 2,
"description": "__MSG_appDescription__",
"icons": {
Expand Down Expand Up @@ -28,7 +28,7 @@
"*://*.feedly.com/*"
],
"js": [
"libs/spinjs/spin.js",
"bower_components/spin.js/spin.js",
"libs/iosOverlay/iosOverlay.js",
"bower_components/mousetrap/mousetrap.js",
"scripts/content.js"
Expand Down
4 changes: 3 additions & 1 deletion app/scripts/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ function translateOptions() {
for(i = 0; i < objects.length; i++) {
if (objects[i].dataset && objects[i].dataset.message) {
var html = chrome.i18n.getMessage(objects[i].dataset.message);
if (html) objects[i].innerHTML = chrome.i18n.getMessage(objects[i].dataset.message);
if (html) {
objects[i].innerHTML = chrome.i18n.getMessage(objects[i].dataset.message);
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"version": "0.0.0",
"dependencies": {
"bootstrap": "~3.2.0",
"mousetrap": "~1.5.2"
"mousetrap": "~1.5.2",
"spin.js": "spinjs#^2.3.2"
},
"devDependencies": {}
}
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
{
"name": "fullyfeedly",
"version": "0.0.0",
"dependencies": {
},
"dependencies": {},
"devDependencies": {
"grunt": "~1.0.1",
"grunt-bower-install": "~1.6.0",
"grunt-chrome-manifest": "~0.3.0",
"grunt-concurrent": "~2.3.0",
"grunt-concurrent": "~2.3.1",
"grunt-contrib-clean": "~1.0.0",
"grunt-contrib-compress": "~1.3.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "~1.0.2",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "~1.0.1",
"grunt-contrib-cssmin": "~1.0.2",
"grunt-contrib-htmlmin": "~2.0.0",
"grunt-contrib-imagemin": "~1.0.1",
"grunt-contrib-jshint": "~1.0.0",
"grunt-contrib-uglify": "~2.0.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-mocha": "~1.0.2",
"grunt-svgmin": "~3.3.0",
"grunt-svgmin": "~4.0.0",
"grunt-usemin": "~3.1.1",
"jshint-stylish": "~2.2.0",
"load-grunt-tasks": "~3.5.0",
"jshint-stylish": "~2.2.1",
"load-grunt-tasks": "~3.5.2",
"time-grunt": "~1.4.0"
},
"engines": {
Expand Down

0 comments on commit 548bf73

Please sign in to comment.