Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sebslomski/angular-pikaday-directive
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: HornsAndHooves/angular-pikaday-directive
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 17 commits
  • 6 files changed
  • 6 contributors

Commits on Jan 22, 2015

  1. Update bower.json

    kont-noor committed Jan 22, 2015
    Copy the full SHA
    23d2e6f View commit details
  2. Update README

    Task 1769
    Task 3158
    Task 2980
    baburdick committed Jan 22, 2015
    Copy the full SHA
    61cc9fc View commit details
  3. Merge kont-noor/angular-pikaday-directive#master v0.0.1.1 'kont-noor/…

    …master'
    
    Task 1769
    Task 3158
    Task 2980
    Task 3160
    
    * kont-noor/master:
      Update bower.json
    baburdick committed Jan 22, 2015
    Copy the full SHA
    664ae3a View commit details
  4. Fix typo

    Task 1769
    Task 3158
    Task 2980
    Task 3160
    baburdick committed Jan 22, 2015
    Copy the full SHA
    0b7962a View commit details

Commits on Aug 18, 2015

  1. add piker object to scope

    kont-noor committed Aug 18, 2015
    Copy the full SHA
    e5fe0aa View commit details

Commits on Aug 20, 2015

  1. Merge HornsAndHooves#1 v0.0.1.2 'kont-noor/get_piker_object'

    Task 6105
    Task 6155
    
    * kont-noor/get_piker_object:
      add piker object to scope
      Update pikaday dependency to 1.2.0
    baburdick committed Aug 20, 2015
    Copy the full SHA
    51b7023 View commit details

Commits on Feb 24, 2016

  1. Copy the full SHA
    16a1858 View commit details

Commits on Feb 25, 2016

  1. Merge HornsAndHooves#2 v0.0.1.3 'XmmmiR/patch-1'

    Task 7947
    Task 8074
    
    * XmmmiR/patch-1:
      Add weekday classes to pikaday datepicker
    baburdick committed Feb 25, 2016
    Copy the full SHA
    ed64f10 View commit details
  2. Remove ES6 interpolation

    Not supported by PhantomJS, breaks tests :(
    XmmmiR committed Feb 25, 2016
    Copy the full SHA
    b710642 View commit details
  3. Merge HornsAndHooves#3 v0.0.1.4 'XmmmiR/patch-2'

    Task 7947
    Task 8074
    
    * XmmmiR/patch-2:
      Remove ES6 interpolation
    baburdick committed Feb 25, 2016
    Copy the full SHA
    15ab28b View commit details

Commits on Mar 24, 2016

  1. Add possibility to have pikaday object in onSelect action. It will ma…

    …ke possible to operate with object who triggered onSelect.
    
    Task 7487
    DShein committed Mar 24, 2016
    Copy the full SHA
    02b7404 View commit details

Commits on Mar 25, 2016

  1. Merge HornsAndHooves#4 v0.0.1.5 'origin/7487_multiple_pikaday_objects'

    Task 7487
    Task 8309
    
    * origin/7487_multiple_pikaday_objects:
      Add possibility to have pikaday object in onSelect action. It will make possible to operate with object who triggered onSelect.
    baburdick committed Mar 25, 2016
    Copy the full SHA
    bcb54c8 View commit details

Commits on Jul 13, 2016

  1. Copy the full SHA
    da4c69e View commit details
  2. Merge IntegraCredit/HornsAndHooves-angular-pikaday-directive#5 v0.0.1…

    ….6 'XmmmiR/master'
    
    Task 8428
    Task 9265
    
    mod: update README
    
    * XmmmiR/master:
      Update pikaday module; Extract excess rendering method
    baburdick committed Jul 13, 2016
    Copy the full SHA
    780b6fb View commit details

Commits on Feb 7, 2018

  1. Add package.json

    AlexeyNechitailo committed Feb 7, 2018
    Copy the full SHA
    6a943c2 View commit details

Commits on Feb 8, 2018

  1. Merge HornsAndHooves#6 v0.0.1.7 'AlexeyNechitailo/master'

    Task 14068
    Task 14758
    
    mod: revise README
    
    * AlexeyNechitailo/master:
      Add package.json
    baburdick committed Feb 8, 2018
    Copy the full SHA
    cbc92bc View commit details

Commits on Mar 1, 2018

  1. Copy the full SHA
    663f934 View commit details
Showing with 58 additions and 7 deletions.
  1. +2 −0 .gitignore
  2. +18 −1 README.md
  3. +2 −2 bower.json
  4. +18 −0 package.json
  5. +5 −4 pikaday-directive.js
  6. +13 −0 yarn.lock
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
bower_components
node_modules
yarn-error.log
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# Angular Pikaday Directive

This directive let you use Pikaday as a Angular directive.
This directive lets you use Pikaday as an Angular directive.

**Note:** To use this fork,
- for `npm` or `yarn` add this to your `package.json` dependencies:

```
"angular-pikaday-directive": "HornsAndHooves/angular-pikaday-directive"
```
- for `bower` add this to your `bower.json` dependencies:
```
"angular-pikaday-directive": "HornsAndHooves/angular-pikaday-directive#0.0.2"
```
It will allow you to use the `v1.4.x` series of `pikaday`.
(Forked by HornsAndHooves.)
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-pikaday-directive",
"version": "0.0.1.1",
"version": "0.0.2",
"authors": [
"Sebastian Slomski <me@sebslomski.com>"
],
@@ -14,6 +14,6 @@
],
"license": "MIT",
"dependencies": {
"pikaday": "~1.2.0"
"pikaday": "~1.4.0"
}
}
18 changes: 18 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "angular-pikaday-directive",
"version": "0.0.2",
"description": "Angular directive for Pikaday datepicker",
"main": "pikaday-directive.js",
"repository": "https://github.com/HornsAndHooves/angular-pikaday-directive.git",
"author": "Sebastian Slomski <me@sebslomski.com>",
"license": "MIT",
"keywords": [
"pikaday",
"angular",
"directive",
"datepicker"
],
"dependencies": {
"pikaday": "~1.4.0"
}
}
9 changes: 5 additions & 4 deletions pikaday-directive.js
Original file line number Diff line number Diff line change
@@ -7,7 +7,8 @@ angular.module('pikaday', [])

return {
scope: {
'date': '=ngModel'
'date': '=ngModel',
'pikadayObject': '='
},
require: 'ngModel',
link: function ($scope, elem, attrs) {
@@ -24,14 +25,14 @@ angular.module('pikaday', [])
$scope.$apply($scope.date);

if (angular.isFunction(onSelect)) {
onSelect();
onSelect($scope.pikadayObject);
}
};

var picker = new Pikaday(options);
$scope.pikadayObject = new Pikaday(options);

$scope.$on('$destroy', function() {
picker.destroy();
$scope.pikadayObject.destroy();
});
}
};
13 changes: 13 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


moment@2.x:
version "2.20.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"

pikaday@1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.4.0.tgz#dd96d4a3c5707289ef4dc7ddf3e0194d0c6ff2e2"
optionalDependencies:
moment "2.x"