Skip to content

Commit

Permalink
1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
icambron committed Apr 26, 2016
1 parent 1635c8b commit 5865c84
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 21 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "twix",
"version": "0.9.0",
"version": "1.0.0",
"dependencies": {
"moment": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion component.json
@@ -1,6 +1,6 @@
{
"name": "twix",
"version": "0.9.0",
"version": "1.0.0",
"dependencies": {
"moment/moment": "*"
},
Expand Down
9 changes: 0 additions & 9 deletions dist/twix.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/twix.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/docs.md
Expand Up @@ -4,7 +4,7 @@ Twix.js is a [Moment.js](http://momentjs.com) plugin for working with time range

###Browser

Grab [the file](https://raw.github.com/icambron/twix.js/master/dist/twix.min.js) as well as [moment.js](https://raw.github.com/timrwood/moment/2.0.0/moment.min.js). Then simply reference twix after Moment:
Grab [the file](https://raw.github.com/icambron/twix.js/master/dist/twix.min.js) as well as [moment.js](https://raw.github.com/moment/moment/blob/develop/min/moment.min.js). Then simply reference twix after Moment:

```html
<script src="moment.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion package.js
@@ -1,7 +1,7 @@
Package.describe({
name: "momentjs:twix",
summary: "Twix.js (official) by Isaac Cambron: a Moment.js plugin for working with date ranges.",
version: "0.9.0",
version: "1.0.0",
git: "https://github.com/icambron/twix.js.git",
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "twix",
"version": "0.9.0",
"version": "1.0.0",
"description": "Twix.js allows you to work with date ranges",
"homepage": "http://icambron.github.io/twix.js/",
"author": "Isaac Cambron",
Expand Down
6 changes: 0 additions & 6 deletions src/twix.coffee
Expand Up @@ -29,7 +29,6 @@ makeTwix = (moment) ->
first

# -- INFORMATIONAL --

start: -> @_start.clone()
end: -> @_end.clone()

Expand Down Expand Up @@ -239,11 +238,6 @@ makeTwix = (moment) ->

needsMeridiem = options.hourFormat && options.hourFormat[0] == 'h'

#deprecated to make things consistent
options.hideTime = !options.showTime if options.showTime?
options.hideYear = !options.showYear if options.showYear?
options.implicitDate = !options.showDate if options.showDate?

goesIntoTheMorning =
options.lastNightEndsAt > 0 &&
!@allDay &&
Expand Down

0 comments on commit 5865c84

Please sign in to comment.