Fixed #528 #527 #525 #523 #520 #519 #515 #504 #502 #499 #487 #486 #458 …

…#449
danialfarid · Feb 4, 2015 · 5442234 · 5442234
1 parent f51fde0
commit 5442234
Show file tree

Hide file tree

Showing 9 changed files with 624 additions and 363 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -12,7 +12,7 @@ module.exports = function(grunt) {
  files : [ {
  expand : true,
  cwd : 'demo/war/js/',
- src : '<%= pkg.name %>*.js',
+ src : 'angular-file-upload*.js',
  dest : 'dist/',
  flatten : true,
  filter : 'isFile'
@@ -61,9 +61,9 @@ module.exports = function(grunt) {
  }
  },
  files: {
- 'demo/war/js/<%= pkg.name %>-all.js': 
- ['demo/war/js/<%= pkg.name %>.js', 
- 'demo/war/js/<%= pkg.name %>-shim.js']
+ 'demo/war/js/angular-file-upload-all.js': 
+ ['demo/war/js/angular-file-upload.js', 
+ 'demo/war/js/angular-file-upload-shim.js']
  }
  }
  },
@@ -73,9 +73,9 @@ module.exports = function(grunt) {
  },
  build : {
  files : [ {
- 'dist/<%= pkg.name %>.min.js' : 'dist/<%= pkg.name %>.js',
- 'dist/<%= pkg.name %>-shim.min.js' : 'dist/<%= pkg.name %>-shim.js',
- 'dist/<%= pkg.name %>-all.min.js' : 'dist/<%= pkg.name %>-all.js'
+ 'dist/angular-file-upload.min.js' : 'dist/angular-file-upload.js',
+ 'dist/angular-file-upload-shim.min.js' : 'dist/angular-file-upload-shim.js',
+ 'dist/angular-file-upload-all.min.js' : 'dist/angular-file-upload-all.js'
  } ]
  }
  },

diff --git a/demo/war/WEB-INF/appengine-web.xml b/demo/war/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
- <application>angular-file-upload-cors-srv</application>
- <version>2-3-0</version>
+ <application>angular-file-upload</application>
+ <version>3-0-0</version>
 
  <!--
  Allows App Engine to send multiple requests to one instance in parallel: