Skip to content

Commit 3b92824

Browse files
committed
Added timeOfDay for custom day/night icons [monkeecreate#36], fixed bug in error message [monkeecreate#38], updated manifest, and pushed v2.3.0.
1 parent dcaf3de commit 3b92824

7 files changed

+27
-26
lines changed

MIT-LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011 James Fleeting, http://jamesfleeting.com/
1+
Copyright (c) 2013 James Fleeting, http://jamesfleeting.com/
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bower install jquery-simpleweather
1010

1111
**[CDNJS](http://cdnjs.com/)**
1212
```html
13-
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.simpleWeather/2.2.0/jquery.simpleWeather.min.js"></script>
13+
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.simpleWeather/2.3.0/jquery.simpleWeather.min.js"></script>
1414
```
1515

1616
**Git**

index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<!-- Facebook -->
1111
<meta property="og:title" content="simpleWeather - a simple jQuery plugin">
1212
<meta property="og:description" content="A simple jQuery plugin to display the current weather information for any location using Yahoo! Weather. Developed by James Fleeting.">
13-
<meta property="og:url" content="http://monkeecreate.github.com/jquery.simpleWeather/">
14-
<meta property="og:image" content="http://monkeecreate.github.com/jquery.simpleWeather/images/og-image.png">
13+
<meta property="og:url" content="http://simpleweatherjs.com/">
14+
<meta property="og:image" content="http://simpleweatherjs.com/images/og-image.png">
1515
<!-- /Facebook -->
1616

1717
<title>simpleWeather - a simple jQuery plugin</title>
@@ -96,9 +96,9 @@ <h2>Fancy Demo</h2>
9696
<hr>
9797
</div>
9898

99-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
99+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
100100
<script src="http:////cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.2.1/bootstrap.min.js"></script>
101-
<script src="jquery.simpleWeather-2.2.min.js"></script>
101+
<script src="jquery.simpleWeather-2.3.min.js"></script>
102102
<script>
103103
$(function() {
104104
$.simpleWeather({

jquery.simpleWeather-2.2.min.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

jquery.simpleWeather-2.3.min.js

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jquery.simpleWeather.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Developed by James Fleeting <@twofivethreetwo> <http://iwasasuperhero.com>
99
* Another project from monkeeCreate <http://monkeecreate.com>
1010
*
11-
* Version 2.2.0 - Last updated: April 30 2013
11+
* Version 2.3.0 - Last updated: June 16 2013
1212
*/
1313
(function($) {
1414
"use strict";
@@ -40,7 +40,7 @@
4040
$.getJSON(
4141
weatherUrl,
4242
function(data) {
43-
if(data !== null && data.query.results !== null) {
43+
if(data !== null && data.query.results !== null && data.query.results.channel.description !== 'Yahoo! Weather Error') {
4444
$.each(data.query.results, function(i, result) {
4545
if (result.constructor.toString().indexOf("Array") !== -1) {
4646
result = result[0];
@@ -87,6 +87,7 @@
8787
tempAlt: tempAlt,
8888
code: result.item.condition.code,
8989
todayCode: result.item.forecast[0].code,
90+
timeOfDay: timeOfDay,
9091
units:{
9192
temp: result.units.temperature,
9293
distance: result.units.distance,

simpleweather.jquery.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"monkeecreate",
1111
"weather-data"
1212
],
13-
"version": "2.2.0",
13+
"version": "2.3.0",
1414
"author": {
1515
"name": "James Fleeting",
1616
"email": "[email protected]",
@@ -23,10 +23,10 @@
2323
}
2424
],
2525
"bugs": "https://github.com/monkeecreate/jquery.simpleWeather/issues",
26-
"homepage": "http://simpleweather.com",
27-
"docs": "http://simpleweather.com",
28-
"download": "http://simpleweather.com",
29-
"demo": "http://simpleweather.com",
26+
"homepage": "http://simpleweatherjs.com",
27+
"docs": "http://simpleweatherjs.com",
28+
"download": "http://simpleweatherjs.com",
29+
"demo": "http://simpleweatherjs.com",
3030
"dependencies": {
3131
"jquery": ">=1.5"
3232
},

0 commit comments

Comments
 (0)