Skip to content
This repository has been archived by the owner on Nov 20, 2018. It is now read-only.

Commit

Permalink
feat(commonjs): CommonJS + AMD support
Browse files Browse the repository at this point in the history
  • Loading branch information
rnicholus committed May 6, 2016
1 parent d444669 commit 0739458
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Fine Uploader](http://fineuploader.com/img/FineUploader_logo.png)](http://fineuploader.com/)

Version: 5.7.1
Version: 5.8.0

[![Build Status](https://travis-ci.org/FineUploader/fine-uploader.png?branch=master)](https://travis-ci.org/FineUploader/fine-uploader)

Expand Down
2 changes: 1 addition & 1 deletion client/js/version.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/*global qq */
qq.version = "5.7.1";
qq.version = "5.8.0";
16 changes: 16 additions & 0 deletions lib/grunt/configs/concat.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,22 @@ module.exports = function(paths) {
"use strict";

return {
options: {
banner: "(function(global) {\n",
footer:
"if (typeof define === 'function' && define.amd) {\n" +
" define(function() {\n" +
" return qq;\n" +
" });\n" +
"}\n" +
"else if (typeof module !== 'undefined' && module.exports) {\n" +
" module.exports = qq;\n" +
"}\n" +
"else {\n" +
" global.qq = qq;\n" +
"}\n" +
"}(window));\n"
},
core: {
src: fineUploaderModules.mergeModules(true, "fuTraditional"),
dest: "" + paths.build + "/<%= pkg.name %>.js"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fine-uploader",
"title": "Fine Uploader",
"version": "5.7.1",
"version": "5.8.0",
"description": "Multiple file upload component with progress-bar, drag-and-drop, support for all modern browsers.",
"main": "./fine-uploader/js/fineuploader.js",
"directories": {
Expand Down

0 comments on commit 0739458

Please sign in to comment.