Skip to content

Commit

Permalink
Merge pull request #18 from victoriafrench/master
Browse files Browse the repository at this point in the history
1.1.2 release
  • Loading branch information
deavial committed Jan 13, 2016
2 parents a93d580 + d44fe7a commit c41698d
Show file tree
Hide file tree
Showing 21 changed files with 460 additions and 22 deletions.
3 changes: 3 additions & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Victoria French <[email protected]>
Victoria French <[email protected]>
Victoria French <[email protected]>
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
### HEAD

* Removed unused variable declarations
* Deprecated window.Defunctr in favor of window.defunctr
* Updated .gitignore with support for webstorm
* Updated humans.txt
* Updated License
* Fixed issue with variable declaration
* Added NPM and Grunt build
* Updated Readme.md
* Updated Changelog.md

### 1.1.1 (February 28, 2014)

* Added Support for Opera Next
Expand Down
196 changes: 196 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
module.exports = function (grunt) {
"use strict";

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
dirs: {
output: 'build',
dist: 'release',
source: 'src'
}
});

grunt.loadNpmTasks('grunt-contrib-copy');
grunt.config('copy', {
scripts: {
src: '<%= dirs.source %>/defunctr.js',
dest: '<%= dirs.output %>/<%= pkg.name %>-<%= pkg.version %>.js'
},
release: {
expand: true,
cwd: '<%= dirs.output %>/',
src: '**',
dest: '<%= dirs.dist %>/',
flatten: true,
filter: 'isFile'
}
});

grunt.loadNpmTasks('grunt-banner');
grunt.config('usebanner', {
options: {
position: 'top',
banner: '/*!\r\n' +
' * <%= pkg.title %> <%= pkg.version %>\r\n' +
' * <%= pkg.homepage %>\r\n' +
' *\r\n' +
' * Copyright 2012 - <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>\r\n' +
' * Released under the <%= pkg.license %> license\r\n' +
' * <%= pkg.licenseUrl %>\r\n' +
' *\r\n' +
' * Build Date: <%= grunt.template.today("isoDateTime") %>\r\n' +
' */\r\n'
},
files: {
src: [
'<%= dirs.output %>/*.js'
]
}
});

grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.config('jshint', {
files: ['<%= dirs.output %>/*.js'],
options: {
globals: {
jQuery: true,
Modernizr: true,
console: true,
module: true,
document: true,
window: true
}
}
});

grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.config('uglify', {
min: {
options: {
sourceMap: true,
sourceMapName: '<%= dirs.output %>/<%= pkg.name %>-<%= pkg.version %>.map'
},
files: {
'<%= dirs.output %>/<%= pkg.name %>-<%= pkg.version %>.min.js': ['<%= dirs.output %>/<%= pkg.name %>-<%= pkg.version %>.js']
}
}
});

grunt.loadNpmTasks('grunt-contrib-watch');
grunt.config('watch', {
scripts: {
files: '<%= dirs.source %>/*.js',
tasks: ['uglify:min']
}
});

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.config('clean', {
release: {
options: {
force: true
},
src: [ '<%= dirs.output %>' ]
},
temp: {
options: {
force: true
},
src: [ 'tmp' ]
}
});

grunt.loadNpmTasks('grunt-replace');
grunt.config('replace', {
build: {
options: {
patterns: [
{
match: 'version',
replacement: '<%= pkg.version %>'
}
]
},
files: [
{
src: ['<%= dirs.source %>/defunctr.js'],
dest: '<%= dirs.output %>/<%= pkg.name %>-<%= pkg.version %>.js'
}
]
},
nuget: {
options: {
patterns: [
{
match: 'version',
replacement: '<%= pkg.version %>'
},
{
match: 'projecturl',
replacement: '<%= pkg.homepage %>'
},
{
match: 'copyright',
replacement: '<%= pkg.author.name %>'
},
{
match: 'year',
replacement: '<%= grunt.template.today("yyyy") %>'
}
]
},
files: [
{
src: ['nuget/Defunctr.config'],
dest: 'nuget/Defunctr.nuspec'
}
]
}
});

grunt.loadNpmTasks('grunt-git-contributors');
grunt.config('contributors', {
master: {
path: 'AUTHORS.txt',
branch: 'master',
chronologically: true
},
f1: {
path: 'AUTHORS.txt',
branch: 'feature/fix-1x',
chronologically: true
},
f2: {
path: 'AUTHORS.txt',
branch: 'legacy-1.x',
chronologically: true
}
});

grunt.loadNpmTasks('grunt-nuget');
grunt.config('nugetpack', {
dist: {
src: 'nuget/Defunctr.nuspec',
dest: 'nuget/'
}
});

// 'clean:release'
grunt.registerTask('default', [
'clean:release',
'replace:build',
'uglify:min',
'usebanner',
'copy:release',
'clean:release',
'clean:temp',
'contributors:master',
'contributors:f1',
'contributors:f2'
]);
grunt.registerTask('nuget', [
'default',
'replace:nuget',
'nugetpack:dist'
]);
};
5 changes: 0 additions & 5 deletions LICENSE

This file was deleted.

22 changes: 22 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

#Licensed Under BSD-3

Defunctr
[http://github.com/cinecove/defunctr](http://github.com/cinecove/defunctr)
Copyright (c) 2012 - 2016 Cinecove Digital, LLC and other contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

[https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)



4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- [NuGet Package](https://www.nuget.org/packages/Defunctr/)

Defunctr detects which browser is visiting your site by detecting feature sets the browser supports. The purpose is to allow UX changes where a change must be made explicitly to an older browser. Using
user-agent detection easily fails and apply browser hacks do not work in all cases. Defunctr makes this detection available in two ways: as properties on a global `Defunctr` object, and as classes on the
user-agent detection easily fails and apply browser hacks do not work in all cases. Defunctr makes this detection available in two ways: as properties on a global `defunctr` object, and as classes on the
`<html>` element. This information allows you to enhance your pages with a granular level of control.

Defunctr has the ability to exclude testing and tagging by appending any of the following classes to your pages `<html>` element:
Expand Down Expand Up @@ -50,4 +50,4 @@ Defunctr has the ability to exclude testing and tagging by appending any of the

### License

MIT lincense
MIT license
2 changes: 1 addition & 1 deletion humans.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# TEAM

Victoria French -- Creator -- @fluffydbunny
Victoria French -- Creator -- @victoriafrench

# THANKS

Expand Down
Binary file added nuget/Defunctr.1.1.2.nupkg
Binary file not shown.
25 changes: 25 additions & 0 deletions nuget/Defunctr.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Defunctr</id>
<version>@@version</version>
<title>Defunctr</title>
<authors>Cinecove</authors>
<owners>Cinecove</owners>
<projectUrl>@@projecturl</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Defunctr is a module for Modernizr that will detect the current browser using feature detection. It will then append browser informational classes to the head element of the page, giving the designer the ability to override CSS styles without using older browser hacks. Changing the browsers compatability mode will cause the correct classes to be applied and changing a user-agent will have not effect on the class generation.</description>
<summary>Defunctr is a module for Modernizr that will append browser versioning information into the head element of your web pages using feature detection.</summary>
<releaseNotes>Minor fixes to variable declarations.</releaseNotes>
<copyright>2013 - @@year @@copyright</copyright>
<tags>Modernizr, Browser Detection, HTML5, Shiv</tags>
<dependencies>
<dependency id="Modernizr" version="2.6.2" />
</dependencies>
</metadata>
<files>
<file src="../release/defunctr-@@version.js" target="content\Scripts\Vendor\Defunctr\defunctr-@@version.js" />
<file src="../release/defunctr-@@version.map" target="content\Scripts\Vendor\Defunctr\defunctr-@@version.map" />
<file src="../release/defunctr-@@version.min.js" target="content\Scripts\Vendor\Defunctr\defunctr-@@version.min.js" />
</files>
</package>
15 changes: 8 additions & 7 deletions nuget/Defunctr.nuspec
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Defunctr</id>
<version>1.1.1</version>
<version>1.1.2</version>
<title>Defunctr</title>
<authors>Cinecove</authors>
<owners>Cinecove</owners>
<projectUrl>http://github.com/cinecove/defunctr</projectUrl>
<projectUrl>https://github.com/cinecove/defunctr</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Defunctr is a module for Modernizr that will detect the current browser using feature detection. It will then append browser informational classes to the head element of the page, giving the designer the ability to override CSS styles without using older browser hacks. Changing the browsers compatability mode will cause the correct classes to be applied and changing a user-agent will have not effect on the class generation.</description>
<summary>Defunctr is a module for Modernizr that will append browser versioning information into the head element of your web pages using feature detection.</summary>
<releaseNotes>Now includes support for Opera Next.</releaseNotes>
<copyright>2013, 2104 Cinecove Digital, LLC</copyright>
<releaseNotes>Minor fixes to variable declarations.</releaseNotes>
<copyright>2013 - 2016 Cinecove Digital, LLC and other contributors</copyright>
<tags>Modernizr, Browser Detection, HTML5, Shiv</tags>
<dependencies>
<dependency id="Modernizr" version="2.6.2" />
</dependencies>
</metadata>
<files>
<file src="..\src\defunctr-1.1.1.js" target="content\Scripts\Vendor\Defunctr\defunctr-1.1.1.js" />
<file src="..\src\defunctr-1.1.1.min.js" target="content\Scripts\Vendor\Defunctr\defunctr-1.1.1.min.js" />
<file src="../release/defunctr-1.1.2.js" target="content\Scripts\Vendor\Defunctr\defunctr-1.1.2.js" />
<file src="../release/defunctr-1.1.2.map" target="content\Scripts\Vendor\Defunctr\defunctr-1.1.2.map" />
<file src="../release/defunctr-1.1.2.min.js" target="content\Scripts\Vendor\Defunctr\defunctr-1.1.2.min.js" />
</files>
</package>
Loading

0 comments on commit c41698d

Please sign in to comment.