Просмотр исходного кода

Merge branch 'master' into pr-fix-link-rewriting

James Allen 8 лет назад
Родитель
Сommit
849861073d
56 измененных файлов с 9430 добавлено и 627 удалено
  1. 1 0
      services/web/.gitignore
  2. 1 0
      services/web/Gruntfile.coffee
  3. 14 25
      services/web/Jenkinsfile
  4. 77 0
      services/web/Makefile
  5. 63 0
      services/web/README.md
  6. 28 0
      services/web/app/coffee/Features/Metadata/MetaController.coffee
  7. 66 0
      services/web/app/coffee/Features/Metadata/MetaHandler.coffee
  8. 0 0
      services/web/app/coffee/Features/Metadata/packageMapping.coffee
  9. 1 1
      services/web/app/coffee/Features/Project/ProjectController.coffee
  10. 33 39
      services/web/app/coffee/Features/Subscription/SubscriptionController.coffee
  11. 0 2
      services/web/app/coffee/Features/Subscription/SubscriptionRouter.coffee
  12. 2 0
      services/web/app/coffee/infrastructure/ExpressLocals.coffee
  13. 1 0
      services/web/app/coffee/infrastructure/PackageVersions.coffee
  14. 4 0
      services/web/app/coffee/router.coffee
  15. 2 1
      services/web/app/views/layout.pug
  16. 2 3
      services/web/app/views/project/editor.pug
  17. 31 6
      services/web/app/views/project/editor/file-tree.pug
  18. 1 0
      services/web/app/views/project/list.pug
  19. 28 5
      services/web/app/views/project/list/modals.pug
  20. 4 1
      services/web/app/views/subscriptions/dashboard.pug
  21. 0 27
      services/web/app/views/subscriptions/edit-billing-details.pug
  22. 4 0
      services/web/bin/acceptance_test
  23. 16 0
      services/web/bin/compile_acceptance_tests
  24. 23 0
      services/web/bin/compile_app
  25. 15 0
      services/web/bin/compile_unit_tests
  26. 26 0
      services/web/bin/generate_volumes_file
  27. 14 0
      services/web/bin/unit_test
  28. 8 7
      services/web/config/settings.defaults.coffee
  29. 36 0
      services/web/docker-compose.yml
  30. 30 0
      services/web/docker-shared.template.yml
  31. 6 12
      services/web/modules/.gitignore
  32. 12 0
      services/web/package.json
  33. 7 28
      services/web/public/coffee/directives/fineUpload.coffee
  34. 9 9
      services/web/public/coffee/ide.coffee
  35. 21 17
      services/web/public/coffee/ide/editor/directives/aceEditor.coffee
  36. 44 17
      services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
  37. 18 83
      services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee
  38. 41 0
      services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/PackageManager.coffee
  39. 691 0
      services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/top_hundred_snippets.coffee
  40. 85 0
      services/web/public/coffee/ide/editor/directives/aceEditor/metadata/MetadataManager.coffee
  41. 16 16
      services/web/public/coffee/ide/file-tree/FileTreeManager.coffee
  42. 17 0
      services/web/public/coffee/ide/files/services/files.coffee
  43. 1 2
      services/web/public/coffee/ide/labels/LabelsManager.coffee
  44. 13 0
      services/web/public/coffee/ide/metadata/MetadataManager.coffee
  45. 49 0
      services/web/public/coffee/ide/metadata/services/metadata.coffee
  46. 0 2
      services/web/public/coffee/libs.coffee
  47. 8 8
      services/web/public/js/ace-1.2.5/mode-latex.js
  48. 7455 0
      services/web/public/js/libs/fineuploader-5.15.4.js
  49. 33 29
      services/web/public/stylesheets/components/fineupload.less
  50. 0 1
      services/web/test/acceptance/coffee/helpers/redis.coffee
  51. 1 1
      services/web/test/acceptance/coffee/helpers/request.coffee
  52. 0 119
      services/web/test/unit/coffee/Labels/LabelsControllerTests.coffee
  53. 0 134
      services/web/test/unit/coffee/Labels/LabelsHandlerTests.coffee
  54. 119 0
      services/web/test/unit/coffee/Metadata/MetaControllerTests.coffee
  55. 243 0
      services/web/test/unit/coffee/Metadata/MetaHandlerTests.coffee
  56. 10 32
      services/web/test/unit/coffee/Subscription/SubscriptionControllerTests.coffee

+ 1 - 0
services/web/.gitignore

@@ -73,3 +73,4 @@ Gemfile.lock
 app/views/external
 
 /modules/
+docker-shared.yml

+ 1 - 0
services/web/Gruntfile.coffee

@@ -196,6 +196,7 @@ module.exports = (grunt) ->
 						"mathjax": "/js/libs/mathjax/MathJax.js?config=TeX-AMS_HTML"
 						"pdfjs-dist/build/pdf": "libs/#{PackageVersions.lib('pdfjs')}/pdf"
 						"ace": "#{PackageVersions.lib('ace')}"
+						"fineuploader": "libs/#{PackageVersions.lib('fineuploader')}"
 					shim:
 						"pdfjs-dist/build/pdf":
 							deps: ["libs/#{PackageVersions.lib('pdfjs')}/compatibility"]

+ 14 - 25
services/web/Jenkinsfile

@@ -42,7 +42,7 @@ pipeline {
         checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'modules/tpr-webmodule'], [$class: 'CloneOption', shallow: true]], userRemoteConfigs: [[credentialsId: 'GIT_DEPLOY_KEY', url: 'git@github.com:sharelatex/tpr-webmodule.git ']]])
         checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'modules/learn-wiki'], [$class: 'CloneOption', shallow: true]], userRemoteConfigs: [[credentialsId: 'GIT_DEPLOY_KEY', url: 'git@bitbucket.org:sharelatex/learn-wiki-web-module.git']]])
         checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'modules/templates'], [$class: 'CloneOption', shallow: true]], userRemoteConfigs: [[credentialsId: 'GIT_DEPLOY_KEY', url: 'git@github.com:sharelatex/templates-webmodule.git']]])
-        checkout([$class: 'GitSCM', branches: [[name: '*/sk-unlisted-projects']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'modules/track-changes'], [$class: 'CloneOption', shallow: true]], userRemoteConfigs: [[credentialsId: 'GIT_DEPLOY_KEY', url: 'git@github.com:sharelatex/track-changes-web-module.git']]])
+        checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'modules/track-changes'], [$class: 'CloneOption', shallow: true]], userRemoteConfigs: [[credentialsId: 'GIT_DEPLOY_KEY', url: 'git@github.com:sharelatex/track-changes-web-module.git']]])
         checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'modules/overleaf-integration'], [$class: 'CloneOption', shallow: true]], userRemoteConfigs: [[credentialsId: 'GIT_DEPLOY_KEY', url: 'git@github.com:sharelatex/overleaf-integration-web-module.git']]])
         checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'modules/overleaf-account-merge'], [$class: 'CloneOption', shallow: true]], userRemoteConfigs: [[credentialsId: 'GIT_DEPLOY_KEY', url: 'git@github.com:sharelatex/overleaf-account-merge.git']]])
       }
@@ -70,6 +70,19 @@ pipeline {
         sh 'ls -l node_modules/.bin'
       }
     }
+    
+    stage('Unit Tests') {
+      steps {
+        sh 'make clean install' // Removes js files, so do before compile
+        sh 'make test_unit MOCHA_ARGS="--reporter=tap"'
+      }
+    }
+    
+    stage('Acceptance Tests') {
+      steps {
+        sh 'make test_acceptance MOCHA_ARGS="--reporter=tap"'
+      }
+    }
 
     stage('Compile') {
       agent {
@@ -109,30 +122,6 @@ pipeline {
       }
     }
     
-    stage('Unit Test') {
-      agent {
-        docker {
-          image 'node:6.9.5'
-          reuseNode true
-        }
-      }
-      steps {
-        sh 'env NODE_ENV=development ./node_modules/.bin/grunt mochaTest:unit --reporter=tap'
-      }
-    }
-    
-    stage('Acceptance Tests') {
-      steps {
-        // This tagged relase of the acceptance test runner is a temporary fix
-        // to get the acceptance tests working before we move to a
-        // docker-compose workflow. See:
-        // https://github.com/sharelatex/web-sharelatex-internal/pull/148
-
-        sh 'docker pull sharelatex/sl-acceptance-test-runner:node-6.9-mongo-3.4'
-        sh 'docker run --rm -v $(pwd):/app --env SHARELATEX_ALLOW_PUBLIC_ACCESS=true sharelatex/sl-acceptance-test-runner:node-6.9-mongo-3.4 || (cat forever/app.log && false)'
-      }
-    }
-    
     stage('Package') {
       steps {
         sh 'rm -rf ./node_modules/grunt*'

+ 77 - 0
services/web/Makefile

@@ -0,0 +1,77 @@
+DOCKER_COMPOSE_FLAGS ?= -f docker-compose.yml
+NPM := docker-compose ${DOCKER_COMPOSE_FLAGS} run --rm npm npm -q
+BUILD_NUMBER ?= local
+BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
+PROJECT_NAME = web
+
+all: install test
+	@echo "Run:"
+	@echo "	make install		to set up the project dependencies (in docker)"
+	@echo "	make test       to run all the tests for the project (in docker)"
+
+add: docker-shared.yml
+	$(NPM) install --save ${P}
+
+add_dev: docker-shared.yml
+	$(NPM) install --save-dev ${P}
+
+install: docker-shared.yml
+	$(NPM) install
+
+clean:
+	rm -f app.js
+	rm -rf app/js
+	rm -rf test/unit/js
+	rm -rf test/acceptance/js
+	for dir in modules/*; \
+	do \
+		rm -f $$dir/index.js; \
+		rm -rf $$dir/app/js; \
+		rm -rf $$dir/test/unit/js; \
+		rm -rf $$dir/test/acceptance/js; \
+	done
+	# Regenerate docker-shared.yml - not stictly a 'clean',
+	# but lets `make clean install` work nicely
+	bin/generate_volumes_file
+	# Deletes node_modules volume
+	docker-compose down --volumes
+
+# Need regenerating if you change the web modules you have installed
+docker-shared.yml:
+	bin/generate_volumes_file
+
+test: test_unit test_acceptance
+
+test_unit: docker-shared.yml
+	docker-compose ${DOCKER_COMPOSE_FLAGS} run --rm test_unit npm -q run test:unit -- ${MOCHA_ARGS}
+
+test_acceptance: test_acceptance_app test_acceptance_modules
+
+test_acceptance_app: test_acceptance_app_start_service test_acceptance_app_run test_acceptance_app_stop_service
+
+test_acceptance_app_start_service: test_acceptance_app_stop_service docker-shared.yml
+	docker-compose ${DOCKER_COMPOSE_FLAGS} up -d test_acceptance
+
+test_acceptance_app_stop_service: docker-shared.yml
+	docker-compose ${DOCKER_COMPOSE_FLAGS} stop test_acceptance redis mongo
+
+test_acceptance_app_run: docker-shared.yml
+	docker-compose ${DOCKER_COMPOSE_FLAGS} exec -T test_acceptance npm -q run test:acceptance -- ${MOCHA_ARGS}
+
+test_acceptance_modules: docker-shared.yml
+	 # Break and error on any module failure
+	set -e; \
+	for dir in modules/*; \
+	do \
+		if [ -e $$dir/Makefile ]; then \
+			(make test_acceptance_module MODULE=$$dir) \
+		fi \
+	done
+
+test_acceptance_module: docker-shared.yml
+	cd $(MODULE) && make test_acceptance
+
+.PHONY:
+	all add install update test test_unit test_acceptance \
+	test_acceptance_start_service test_acceptance_stop_service \
+	test_acceptance_run

+ 63 - 0
services/web/README.md

@@ -17,6 +17,69 @@ web-sharelatex uses [Grunt](http://gruntjs.com/) to build its front-end related
 
 Image processing tasks are commented out in the gruntfile and the needed packages aren't presently in the project's `package.json`. If the images need to be processed again (minified and sprited), start by fetching the packages (`npm install grunt-contrib-imagemin grunt-sprity`), then *decomment* the tasks in `Gruntfile.coffee`. After this, the tasks can be called (explicitly, via `grunt imagemin` and `grunt sprity`).
 
+New Docker-based build process
+------------------------------
+
+Note that the Grunt workflow from above should still work, but we are transitioning to a 
+Docker based testing workflow, which is documented below:
+
+### Running the app
+
+The app runs natively using npm and Node on the local system:
+
+```
+$ npm install
+$ npm run start
+```
+
+*Ideally the app would run in Docker like the tests below, but with host networking not supported in OS X, we need to run it natively until all services are Dockerised.*
+
+### Unit Tests
+
+The test suites run in Docker.
+
+Unit tests can be run in the `test_unit` container defined in `docker-compose.tests.yml`.
+
+The makefile contains a short cut to run these:
+
+```
+make install # Only needs running once, or when npm packages are updated
+make unit_test
+```
+
+During development it is often useful to only run a subset of tests, which can be configured with arguments to the mocha CLI:
+
+```
+make unit_test MOCHA_ARGS='--grep=AuthorizationManager'
+```
+
+### Acceptance Tests
+
+Acceptance tests are run against a live service, which runs in the `acceptance_test` container defined in `docker-compose.tests.yml`.
+
+To run the tests out-of-the-box, the makefile defines:
+
+```
+make install # Only needs running once, or when npm packages are updated
+make acceptance_test
+```
+
+However, during development it is often useful to leave the service running for rapid iteration on the acceptance tests. This can be done with:
+
+```
+make acceptance_test_start_service
+make acceptance_test_run # Run as many times as needed during development
+make acceptance_test_stop_service
+```
+
+`make acceptance_test` just runs these three commands in sequence.
+
+During development it is often useful to only run a subset of tests, which can be configured with arguments to the mocha CLI:
+
+```
+make acceptance_test_run MOCHA_ARGS='--grep=AuthorizationManager'
+```
+
 Unit test status
 ----------------
 

+ 28 - 0
services/web/app/coffee/Features/Metadata/MetaController.coffee

@@ -0,0 +1,28 @@
+EditorRealTimeController = require "../Editor/EditorRealTimeController"
+MetaHandler = require './MetaHandler'
+logger = require 'logger-sharelatex'
+
+
+module.exports = MetaController =
+
+	getMetadata: (req, res, next) ->
+		project_id = req.params.project_id
+		logger.log {project_id}, "getting all labels for project"
+		MetaHandler.getAllMetaForProject project_id, (err, projectMeta) ->
+			if err?
+				logger.err {project_id, err}, "[MetaController] error getting all labels from project"
+				return next err
+			res.json {projectId: project_id, projectMeta: projectMeta}
+
+	broadcastMetadataForDoc: (req, res, next) ->
+		project_id = req.params.project_id
+		doc_id = req.params.doc_id
+		logger.log {project_id, doc_id}, "getting labels for doc"
+		MetaHandler.getMetaForDoc project_id, doc_id, (err, docMeta) ->
+			if err?
+				logger.err {project_id, doc_id, err}, "[MetaController] error getting labels from doc"
+				return next err
+			EditorRealTimeController.emitToRoom project_id, 'broadcastDocMeta', {
+				docId: doc_id, meta: docMeta
+			}
+			res.sendStatus 200

+ 66 - 0
services/web/app/coffee/Features/Metadata/MetaHandler.coffee

@@ -0,0 +1,66 @@
+ProjectEntityHandler = require "../Project/ProjectEntityHandler"
+DocumentUpdaterHandler = require '../DocumentUpdater/DocumentUpdaterHandler'
+packageMapping = require "./packageMapping"
+
+
+module.exports = MetaHandler =
+
+	labelRegex: () ->
+		/\\label{(.{0,80}?)}/g
+
+	usepackageRegex: () ->
+		/^\\usepackage(?:\[.{0,80}?])?{(.{0,80}?)}/g
+
+	ReqPackageRegex: () ->
+		/^\\RequirePackage(?:\[.{0,80}?])?{(.{0,80}?)}/g
+
+	getAllMetaForProject: (projectId, callback=(err, projectMeta)->) ->
+		DocumentUpdaterHandler.flushProjectToMongo projectId, (err) ->
+			if err?
+				return callback err
+			ProjectEntityHandler.getAllDocs projectId, (err, docs) ->
+				if err?
+					return callback err
+				projectMeta = MetaHandler.extractMetaFromProjectDocs docs
+				callback null, projectMeta
+
+	getMetaForDoc: (projectId, docId, callback=(err, docMeta)->) ->
+		DocumentUpdaterHandler.flushDocToMongo projectId, docId, (err) ->
+			if err?
+				return callback err
+			ProjectEntityHandler.getDoc projectId, docId, (err, lines) ->
+				if err?
+					return callback err
+				docMeta = MetaHandler.extractMetaFromDoc lines
+				callback null, docMeta
+
+	extractMetaFromDoc: (lines) ->
+		docMeta = {labels: [], packages: {}}
+		packages = []
+		label_re = MetaHandler.labelRegex()
+		package_re = MetaHandler.usepackageRegex()
+		req_package_re = MetaHandler.ReqPackageRegex()
+		for line in lines
+			while labelMatch = label_re.exec line
+				if label = labelMatch[1]
+					docMeta.labels.push label
+			while packageMatch = package_re.exec line
+				if messy = packageMatch[1]
+					for pkg in messy.split ','
+						if clean = pkg.trim()
+							packages.push clean
+			while packageMatch = req_package_re.exec line
+				if messy = packageMatch[1]
+					for pkg in messy.split ','
+						if clean = pkg.trim()
+							packages.push clean
+		for pkg in packages
+			if packageMapping[pkg]?
+				docMeta.packages[pkg] = packageMapping[pkg]
+		return docMeta
+
+	extractMetaFromProjectDocs: (projectDocs) ->
+		projectMeta = {}
+		for _path, doc of projectDocs
+			projectMeta[doc._id] = MetaHandler.extractMetaFromDoc doc.lines
+		return projectMeta

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
services/web/app/coffee/Features/Metadata/packageMapping.coffee


+ 1 - 1
services/web/app/coffee/Features/Project/ProjectController.coffee

@@ -251,7 +251,7 @@ module.exports = ProjectController =
 				# Extract data from user's ObjectId
 				timestamp = parseInt(user_id.toString().substring(0, 8), 16)
 
-				rolloutPercentage = 10 # Percentage of users to roll out to
+				rolloutPercentage = 20 # Percentage of users to roll out to
 				if !ProjectController._isInPercentageRollout('autocompile', user_id, rolloutPercentage)
 					# Don't show if user is not part of roll out
 					return cb(null, { enabled: false, showOnboarding: false })

+ 33 - 39
services/web/app/coffee/Features/Subscription/SubscriptionController.coffee

@@ -97,20 +97,39 @@ module.exports = SubscriptionController =
 				logger.log user: user, "redirecting to plans"
 				res.redirect "/user/subscription/plans"
 			else
-				SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel user, (error, subscription, groupSubscriptions) ->
-					return next(error) if error?
-					logger.log user: user, subscription:subscription, hasSubOrIsGroupMember:hasSubOrIsGroupMember, groupSubscriptions:groupSubscriptions, "showing subscription dashboard"
-					plans = SubscriptionViewModelBuilder.buildViewModel()
-					res.render "subscriptions/dashboard",
-						title: "your_subscription"
-						recomendedCurrency: subscription?.currency
-						taxRate:subscription?.taxRate
-						plans: plans
-						subscription: subscription || {}
-						groupSubscriptions: groupSubscriptions
-						subscriptionTabActive: true
-						user:user
-						saved_billing_details: req.query.saved_billing_details?
+				RecurlyWrapper.getSubscription subscription.recurlySubscription_id,
+					includeAccount: true,
+					(err, usersSubscription)->
+						# always render the page, but skip the recurly link if
+						# we can't get it for some reason
+						if err?
+							logger.err {err, userId: user._id}, "error getting billing details link from recurly, proceeding"
+						hostedLoginToken = usersSubscription?.account?.hosted_login_token
+						recurlySubdomain = Settings?.apis?.recurly?.subdomain
+						if err? || !hostedLoginToken || !recurlySubdomain
+							billingDetailsLink = null
+						else
+							billingDetailsLink = [
+								"https://",
+								recurlySubdomain,
+								".recurly.com/account/billing_info/edit?ht=",
+								hostedLoginToken
+							].join("")
+						SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel user, (error, subscription, groupSubscriptions) ->
+							return next(error) if error?
+							logger.log {user, subscription, hasSubOrIsGroupMember, groupSubscriptions, billingDetailsLink}, "showing subscription dashboard"
+							plans = SubscriptionViewModelBuilder.buildViewModel()
+							res.render "subscriptions/dashboard",
+								title: "your_subscription"
+								recomendedCurrency: subscription?.currency
+								taxRate:subscription?.taxRate
+								plans: plans
+								subscription: subscription || {}
+								groupSubscriptions: groupSubscriptions
+								subscriptionTabActive: true
+								user:user
+								saved_billing_details: req.query.saved_billing_details?
+								billingDetailsLink: billingDetailsLink
 
 	userCustomSubscriptionPage: (req, res, next)->
 		user = AuthenticationController.getSessionUser(req)
@@ -124,31 +143,6 @@ module.exports = SubscriptionController =
 				title: "your_subscription"
 				subscription: subscription
 
-
-	editBillingDetailsPage: (req, res, next) ->
-		user = AuthenticationController.getSessionUser(req)
-		LimitationsManager.userHasSubscription user, (err, hasSubscription)->
-			return next(err) if err?
-			if !hasSubscription
-				res.redirect "/user/subscription"
-			else
-				RecurlyWrapper.sign {
-					account_code: user._id
-				}, (error, signature) ->
-					return next(error) if error?
-					res.render "subscriptions/edit-billing-details",
-						title      : "update_billing_details"
-						recurlyConfig: JSON.stringify
-							currency: "USD"
-							subdomain: Settings.apis.recurly.subdomain
-						signature  : signature
-						successURL : "#{Settings.siteUrl}/user/subscription/billing-details/update"
-						user       :
-							id : user._id
-
-	updateBillingDetails: (req, res, next) ->
-		res.redirect "/user/subscription?saved_billing_details=true"
-
 	createSubscription: (req, res, next)->
 		user = AuthenticationController.getSessionUser(req)
 		recurly_token_id = req.body.recurly_token_id

+ 0 - 2
services/web/app/coffee/Features/Subscription/SubscriptionRouter.coffee

@@ -15,8 +15,6 @@ module.exports =
 
 		
 		webRouter.get  '/user/subscription/new',        AuthenticationController.requireLogin(), SubscriptionController.paymentPage 
-		webRouter.get  '/user/subscription/billing-details/edit', AuthenticationController.requireLogin(), SubscriptionController.editBillingDetailsPage
-		webRouter.post '/user/subscription/billing-details/update', AuthenticationController.requireLogin(), SubscriptionController.updateBillingDetails
 
 		webRouter.get  '/user/subscription/thank-you', AuthenticationController.requireLogin(), SubscriptionController.successful_subscription
 

+ 2 - 0
services/web/app/coffee/infrastructure/ExpressLocals.coffee

@@ -24,6 +24,7 @@ jsPath =
 
 ace = PackageVersions.lib('ace')
 pdfjs = PackageVersions.lib('pdfjs')
+fineuploader = PackageVersions.lib('fineuploader')
 
 getFileContent = (filePath)->
 	filePath = Path.join __dirname, "../../../", "public#{filePath}"
@@ -37,6 +38,7 @@ getFileContent = (filePath)->
 
 logger.log "Generating file fingerprints..."
 pathList = [
+	["#{jsPath}libs/#{fineuploader}.js"]
 	["#{jsPath}libs/require.js"]
 	["#{jsPath}ide.js"]
 	["#{jsPath}main.js"]

+ 1 - 0
services/web/app/coffee/infrastructure/PackageVersions.coffee

@@ -2,6 +2,7 @@ version = {
 	"pdfjs": "1.7.225"
 	"moment": "2.9.0"
 	"ace": "1.2.5"
+	"fineuploader": "5.15.4"
 }
 
 module.exports = {

+ 4 - 0
services/web/app/coffee/router.coffee

@@ -43,6 +43,7 @@ SudoModeController = require('./Features/SudoMode/SudoModeController')
 SudoModeMiddlewear = require('./Features/SudoMode/SudoModeMiddlewear')
 AnalyticsRouter = require('./Features/Analytics/AnalyticsRouter')
 AnnouncementsController = require("./Features/Announcements/AnnouncementsController")
+MetaController = require('./Features/Metadata/MetaController')
 LabelsController = require('./Features/Labels/LabelsController')
 TokenAccessController = require('./Features/TokenAccess/TokenAccessController')
 Features = require('./infrastructure/Features')
@@ -202,6 +203,9 @@ module.exports = class Router
 		webRouter.get  '/Project/:Project_id/download/zip', AuthorizationMiddlewear.ensureUserCanReadProject, ProjectDownloadsController.downloadProject
 		webRouter.get  '/project/download/zip', AuthorizationMiddlewear.ensureUserCanReadMultipleProjects, ProjectDownloadsController.downloadMultipleProjects
 
+		webRouter.get '/project/:project_id/metadata', AuthorizationMiddlewear.ensureUserCanReadProject, AuthenticationController.requireLogin(), MetaController.getMetadata
+		webRouter.post '/project/:project_id/doc/:doc_id/metadata', AuthorizationMiddlewear.ensureUserCanReadProject, AuthenticationController.requireLogin(), MetaController.broadcastMetadataForDoc
+
 		webRouter.get '/project/:project_id/labels', AuthorizationMiddlewear.ensureUserCanReadProject, AuthenticationController.requireLogin(), LabelsController.getAllLabels
 		webRouter.post '/project/:project_id/doc/:doc_id/labels', AuthorizationMiddlewear.ensureUserCanReadProject, AuthenticationController.requireLogin(), LabelsController.broadcastLabelsForDoc
 

+ 2 - 1
services/web/app/views/layout.pug

@@ -132,7 +132,8 @@ html(itemscope, itemtype='http://schema.org/Product')
 				// minimal requirejs configuration (can be extended/overridden)
 				window.requirejs = {
 					"paths" : {
-						"moment": "libs/#{lib('moment')}"
+						"moment": "libs/#{lib('moment')}",
+						"fineuploader": "libs/#{lib('fineuploader')}"
 					},
 					"urlArgs": "fingerprint=#{fingerprint(jsPath + 'main.js')}-#{fingerprint(jsPath + 'libs.js')}",
 					"config":{

+ 2 - 3
services/web/app/views/project/editor.pug

@@ -130,7 +130,8 @@ block requirejs
 				"moment": "libs/#{lib('moment')}",
 				"pdfjs-dist/build/pdf": "libs/#{lib('pdfjs')}/pdf",
 				"pdfjs-dist/build/pdf.worker": "#{pdfWorkerPath}",
-				"ace": "#{lib('ace')}"
+				"ace": "#{lib('ace')}",
+				"fineuploader": "libs/#{lib('fineuploader')}"
 			},
 			"urlArgs" : "fingerprint=#{fingerprint(jsPath + 'ide.js')}-#{fingerprint(jsPath + 'libs.js')}",
 			"waitSeconds": 0,
@@ -164,5 +165,3 @@ block requirejs
 		data-ace-base=buildJsPath(lib('ace'), {fingerprint:false}),
 		src=buildJsPath('libs/require.js')
 	)
-
-	

+ 31 - 6
services/web/app/views/project/editor/file-tree.pug

@@ -333,6 +333,7 @@ script(type='text/ng-template', id='newDocModalTemplate')
 			span(ng-hide="state.inflight") #{translate("create")}
 			span(ng-show="state.inflight") #{translate("creating")}...
 
+
 script(type='text/ng-template', id='newFolderModalTemplate')
 	.modal-header
 		h3 #{translate("new_folder")}
@@ -363,6 +364,34 @@ script(type='text/ng-template', id='newFolderModalTemplate')
 			span(ng-hide="state.inflight") #{translate("create")}
 			span(ng-show="state.inflight") #{translate("creating")}...
 
+
+script(type="text/template", id="qq-file-uploader-template")
+	div.qq-uploader-selector
+		div(qq-hide-dropzone="").qq-upload-drop-area-selector.qq-upload-drop-area
+			span.qq-upload-drop-area-text-selector #{translate('drop_files_here_to_upload')}
+		div.qq-upload-button-selector.btn.btn-primary.btn-lg
+			div #{translate('upload')}
+		span.or.btn-lg #{translate('or')}
+		span.drag-here.btn-lg #{translate('drag_here')}
+		span.qq-drop-processing-selector
+			span #{translate('processing')}
+			span.qq-drop-processing-spinner-selector
+		ul.qq-upload-list-selector
+			li
+				div.qq-progress-bar-container-selector
+					div(
+						role="progressbar"
+						aria-valuenow="0"
+						aria-valuemin="0"
+						aria-valuemax="100"
+						class="qq-progress-bar-selector qq-progress-bar"
+					)
+				span.qq-upload-file-selector.qq-upload-file
+				span.qq-upload-size-selector.qq-upload-size
+				a(type="button").qq-btn.qq-upload-cancel-selector.qq-upload-cancel #{translate('cancel')}
+				button(type="button").qq-btn.qq-upload-retry-selector.qq-upload-retry #{translate('retry')}
+				span(role="status").qq-upload-status-text-selector.qq-upload-status-text
+
 script(type="text/ng-template", id="uploadFileModalTemplate")
 	.modal-header
 		h3 #{translate("upload_files")}
@@ -384,11 +413,7 @@ script(type="text/ng-template", id="uploadFileModalTemplate")
 	.modal-body(
 		fine-upload
 		endpoint="/project/{{ project_id }}/upload"
-		waiting-for-response-text="{{inserting_files}}"
-		failed-upload-text="{{upload_failed_sorry}}"
-		upload-button-text="{{select_files}}"
-		drag-area-text="{{drag_files}}"
-		hint-text="{{hint_press_and_hold_control_key}}"
+		template-id="qq-file-uploader-template"
 		multiple="true"
 		auto-upload="false"
 		on-complete-callback="onComplete"
@@ -400,10 +425,10 @@ script(type="text/ng-template", id="uploadFileModalTemplate")
 		control="control"
 		params="{'folder_id': parent_folder_id}"
 	)
-		span #{translate("upload_files")}
 	.modal-footer
 		button.btn.btn-default(ng-click="cancel()") #{translate("cancel")}
 
+
 script(type='text/ng-template', id='deleteEntityModalTemplate')
 	.modal-header
 		h3 #{translate("delete")} {{ entity.name }}

+ 1 - 0
services/web/app/views/project/list.pug

@@ -6,6 +6,7 @@ block content
 	script#data(type="application/json").
 		!{JSON.stringify({ projects: projects, tags: tags, notifications: notifications }).replace(/\//g, '\\/')}
 
+
 	script(type="text/javascript").
 		window.data = JSON.parse($("#data").text());
 		window.algolia = {

+ 28 - 5
services/web/app/views/project/list/modals.pug

@@ -213,6 +213,33 @@ script(type='text/ng-template', id='deleteProjectsModalTemplate')
 			ng-click="delete()"
 		) #{translate("confirm")}
 
+script(type="text/template", id="qq-project-uploader-template")
+	div.qq-uploader-selector
+		div(qq-hide-dropzone="").qq-upload-drop-area-selector.qq-upload-drop-area
+			span.qq-upload-drop-area-text-selector #{translate('drop_files_here_to_upload')}
+		div.qq-upload-button-selector.btn.btn-primary.btn-lg
+			div #{translate('select_a_zip_file')}
+		span.or.btn-lg #{translate('or')}
+		span.drag-here.btn-lg #{translate('drag_a_zip_file')}
+		span.qq-drop-processing-selector
+			span #{translate('creating_project')}
+			span.qq-drop-processing-spinner-selector
+		ul.qq-upload-list-selector
+			li
+				div.qq-progress-bar-container-selector
+					div(
+						role="progressbar"
+						aria-valuenow="0"
+						aria-valuemin="0"
+						aria-valuemax="100"
+						class="qq-progress-bar-selector qq-progress-bar"
+					)
+				span.qq-upload-file-selector.qq-upload-file
+				span.qq-upload-size-selector.qq-upload-size
+				a(type="button").qq-btn.qq-upload-cancel-selector.qq-upload-cancel #{translate('cancel')}
+				button(type="button").qq-btn.qq-upload-retry-selector.qq-upload-retry #{translate('retry')}
+				span(role="status").qq-upload-status-text-selector.qq-upload-status-text
+
 script(type="text/ng-template", id="uploadProjectModalTemplate")
 	.modal-header
 		button.close(
@@ -224,15 +251,11 @@ script(type="text/ng-template", id="uploadProjectModalTemplate")
 	.modal-body(
 		fine-upload
 		endpoint="/project/new/upload"
-		waiting-for-response-text="Creating project..."
-		failed-upload-text="Upload failed. Is it a valid zip file?"
-		upload-button-text="Select a .zip file"
-		drag-area-text="drag .zip file"
+		template-id="qq-project-uploader-template"
 		multiple="false"
 		allowed-extensions="['zip']"
 		on-complete-callback="onComplete"
 	)
-		span #{translate("upload_a_zipped_project")}
 	.modal-footer
 		button.btn.btn-default(ng-click="cancel()") #{translate("cancel")}
 

+ 4 - 1
services/web/app/views/subscriptions/dashboard.pug

@@ -61,7 +61,10 @@ block content
 									p !{translate("next_payment_of_x_collectected_on_y", {paymentAmmount:"<strong>" + subscription.price + "</strong>", collectionDate:"<strong>" + subscription.nextPaymentDueAt + "</strong>"})}
 									p.pull-right
 									p
-										a(href="/user/subscription/billing-details/edit").btn.btn-info #{translate("update_your_billing_details")}
+										if billingDetailsLink
+											a(href=billingDetailsLink, target="_blank").btn.btn-info #{translate("update_your_billing_details")}
+										else
+											a(href=billingDetailsLink, disabled).btn.btn-info.btn-disabled #{translate("update_your_billing_details")}
 										| &nbsp;
 										a(href, ng-click="switchToCancelationView()").btn.btn-primary !{translate("cancel_your_subscription")}
 								when "canceled"

+ 0 - 27
services/web/app/views/subscriptions/edit-billing-details.pug

@@ -1,27 +0,0 @@
-extends ../layout
-
-block scripts
-	script(src=buildJsPath('libs/recurly.min.js', {fingerprint:false}))
-
-block content
-	.content.content-alt
-		.container
-			.row
-				.col-md-6.col-md-offset-3
-					.card
-						.page-header
-							h1.text-centered #{translate("update_your_billing_details")}
-						#billingDetailsForm #{translate("loading_billing_form")}...
-	
-
-	script(type="text/javascript").
-		Recurly.config(!{recurlyConfig})
-		Recurly.buildBillingInfoUpdateForm({
-			target      : "#billingDetailsForm",
-			successURL  : "#{successURL}?_csrf=#{csrfToken}&origin=editBillingDetails",
-			signature   : "!{signature}",
-			accountCode : "#{user.id}"
-		});
-
-
-

+ 4 - 0
services/web/bin/acceptance_test

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e;
+MOCHA="node_modules/.bin/mocha --recursive --reporter spec --timeout 15000"
+$MOCHA "$@"

+ 16 - 0
services/web/bin/compile_acceptance_tests

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e;
+
+COFFEE=node_modules/.bin/coffee
+
+echo Compiling test/acceptance/coffee;
+$COFFEE -o test/acceptance/js -c test/acceptance/coffee;
+
+for dir in modules/*;
+do
+
+	if [ -d $dir/test/acceptance ]; then
+		echo Compiling $dir/test/acceptance/coffee;
+		$COFFEE -o $dir/test/acceptance/js -c $dir/test/acceptance/coffee;
+	fi
+done

+ 23 - 0
services/web/bin/compile_app

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e;
+
+COFFEE=node_modules/.bin/coffee
+
+echo Compiling app.coffee;
+$COFFEE -c app.coffee;
+
+echo Compiling app/coffee;
+$COFFEE -o app/js -c app/coffee;
+
+for dir in modules/*;
+do
+	if [ -d $dir/app/coffee ]; then
+		echo Compiling $dir/app/coffee;
+		$COFFEE -o $dir/app/js -c $dir/app/coffee;
+	fi
+
+	if [ -e $dir/index.coffee ]; then
+		echo Compiling $dir/index.coffee;
+		$COFFEE -c $dir/index.coffee;
+	fi
+done

+ 15 - 0
services/web/bin/compile_unit_tests

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e;
+
+COFFEE=node_modules/.bin/coffee
+
+echo Compiling test/unit/coffee;
+$COFFEE -o test/unit/js -c test/unit/coffee;
+
+for dir in modules/*;
+do
+	if [ -d $dir/test/unit ]; then
+		echo Compiling $dir/test/unit/coffee;
+		$COFFEE -o $dir/test/unit/js -c $dir/test/unit/coffee;
+	fi
+done

+ 26 - 0
services/web/bin/generate_volumes_file

@@ -0,0 +1,26 @@
+#!/usr/bin/env python2
+
+from os import listdir
+from os.path import isfile, isdir, join
+
+volumes = []
+
+for module in listdir("modules/"):
+	if module[0] != '.':
+		if isfile(join("modules", module, 'index.coffee')):
+			volumes.append(join("modules", module, 'index.coffee'))
+		for directory in ['app/coffee', 'app/views', 'public/coffee', 'test/unit/coffee', 'test/acceptance/coffee', 'test/acceptance/config', 'test/acceptance/files']:
+			if isdir(join("modules", module, directory)):
+				volumes.append(join("modules", module, directory))
+
+volumes_string = map(lambda vol: "- ./" + vol + ":/app/" + vol + ":ro", volumes)
+volumes_string = "\n      ".join(volumes_string)
+
+with open("docker-shared.template.yml", "r") as f:
+	docker_shared_file = f.read()
+
+docker_shared_file = docker_shared_file.replace("MODULE_VOLUMES", volumes_string)
+
+with open("docker-shared.yml", "w") as f:
+	f.write(docker_shared_file)
+

+ 14 - 0
services/web/bin/unit_test

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e;
+
+MOCHA="node_modules/.bin/mocha --recursive --reporter spec"
+
+$MOCHA "$@" test/unit/js
+
+for dir in modules/*;
+do
+	if [ -d $dir/test/unit/js ]; then
+		$MOCHA "$@" $dir/test/unit/js
+	fi
+done
+

+ 8 - 7
services/web/config/settings.defaults.coffee

@@ -35,12 +35,12 @@ module.exports = settings =
 	# Databases
 	# ---------
 	mongo:
-		url : 'mongodb://127.0.0.1/sharelatex'
+		url : process.env['MONGO_URL'] || "mongodb://127.0.0.1/sharelatex"
 
 	redis:
 		web:
-			host: "localhost"
-			port: "6379"
+			host: process.env['REDIS_HOST'] || "localhost"
+			port: process.env['REDIS_PORT'] || "6379"
 			password: ""
 
 		# websessions:
@@ -74,8 +74,8 @@ module.exports = settings =
 		# 	]
 
 		api:
-			host: "localhost"
-			port: "6379"
+			host: process.env['REDIS_HOST'] || "localhost"
+			port: process.env['REDIS_PORT'] || "6379"
 			password: ""
 
 	# Service locations
@@ -87,6 +87,7 @@ module.exports = settings =
 	internal:
 		web:
 			port: webPort = 3000
+			host: process.env['LISTEN_ADDRESS'] or 'localhost'
 		documentupdater:
 			port: docUpdaterPort = 3003
 
@@ -99,7 +100,7 @@ module.exports = settings =
 			user: httpAuthUser
 			pass: httpAuthPass
 		documentupdater:
-			url : "http://localhost:#{docUpdaterPort}"
+			url : "http://#{process.env['DOCUPDATER_HOST'] or 'localhost'}:#{docUpdaterPort}"
 		thirdPartyDataStore:
 			url : "http://localhost:3002"
 			emptyProjectFlushDelayMiliseconds: 5 * seconds
@@ -113,7 +114,7 @@ module.exports = settings =
 			enabled: false
 			url : "http://localhost:3054"
 		docstore:
-			url : "http://localhost:3016"
+			url : "http://#{process.env['DOCSTORE_HOST'] or 'localhost'}:3016"
 			pubUrl: "http://localhost:3016"
 		chat:
 			url: "http://localhost:3010"

+ 36 - 0
services/web/docker-compose.yml

@@ -0,0 +1,36 @@
+version: "2"
+
+volumes:
+  node_modules:
+
+services:
+  npm:
+    extends:
+      file: docker-shared.yml
+      service: app
+    command: npm install
+
+  test_unit:
+    extends:
+      file: docker-shared.yml
+      service: app
+    command: npm run test:unit
+
+  test_acceptance:
+    extends:
+      file: docker-shared.yml
+      service: app
+    environment:
+      REDIS_HOST: redis
+      MONGO_URL: "mongodb://mongo/sharelatex"
+      SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true'
+    depends_on:
+      - redis
+      - mongo
+    command: npm run start
+
+  redis:
+    image: redis
+
+  mongo:
+    image: mongo:3.4.6

+ 30 - 0
services/web/docker-shared.template.yml

@@ -0,0 +1,30 @@
+version: "2"
+
+# We mount all the directories explicitly so that we are only mounting
+# the coffee directories, so that the compiled js is only written inside
+# the container, and not back to the local filesystem, where it would be
+# root owned, and conflict with working outside of the container.
+
+services:
+  app:
+    image: node:6.9.5
+    volumes:
+      - ./package.json:/app/package.json
+      - ./npm-shrinkwrap.json:/app/npm-shrinkwrap.json
+      - node_modules:/app/node_modules
+      - ./bin:/app/bin
+      # Copying the whole public dir is fine for now, and needed for
+      # some unit tests to pass, but we will want to isolate the coffee
+      # and vendor js files, so that the compiled js files are not written
+      # back to the local filesystem.
+      - ./public:/app/public
+      - ./app.coffee:/app/app.coffee:ro
+      - ./app/coffee:/app/app/coffee:ro
+      - ./app/templates:/app/app/templates:ro
+      - ./app/views:/app/app/views:ro
+      - ./config:/app/config
+      - ./test/unit/coffee:/app/test/unit/coffee:ro
+      - ./test/acceptance/coffee:/app/test/acceptance/coffee:ro
+      - ./test/smoke/coffee:/app/test/smoke/coffee:ro
+      MODULE_VOLUMES
+    working_dir: /app

+ 6 - 12
services/web/modules/.gitignore

@@ -1,12 +1,6 @@
-*/app/js
-*/test/unit/js
-*/index.js
-ldap
-admin-panel
-groovehq
-launchpad
-learn-wiki
-references-search
-sharelatex-saml
-templates
-tpr-webmodule
+# Ignore all modules except for a whitelist
+*
+!dropbox
+!github-sync
+!public-registration
+!.gitignore

+ 12 - 0
services/web/package.json

@@ -9,6 +9,17 @@
   "directories": {
     "public": "./public"
   },
+  "scripts": {
+    "test:acceptance:wait_for_app": "echo 'Waiting for app to be accessible' && while (! curl -s -o /dev/null localhost:3000/status) do sleep 1; done",
+    "test:acceptance:run": "bin/acceptance_test $@",
+    "test:acceptance:dir": "npm -q run compile:acceptance_tests && npm -q run test:acceptance:wait_for_app && npm -q run test:acceptance:run -- $@",
+    "test:acceptance": "npm -q run test:acceptance:dir -- $@ test/acceptance/js",
+    "test:unit": "npm -q run compile:app && npm -q run compile:unit_tests && bin/unit_test $@",
+    "compile:unit_tests": "bin/compile_unit_tests",
+    "compile:acceptance_tests": "bin/compile_acceptance_tests",
+    "compile:app": "bin/compile_app",
+    "start": "npm -q run compile:app && node app.js"
+  },
   "dependencies": {
     "archiver": "0.9.0",
     "async": "0.6.2",
@@ -98,6 +109,7 @@
     "grunt-postcss": "^0.8.0",
     "grunt-sed": "^0.1.1",
     "grunt-shell": "^2.1.0",
+    "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
     "sandboxed-module": "0.2.0",
     "sinon": "^1.17.0",
     "timekeeper": "",

+ 7 - 28
services/web/public/coffee/directives/fineUpload.coffee

@@ -1,16 +1,13 @@
 define [
 	"base"
-], (App) ->
+	"fineuploader"
+], (App, qq) ->
 	App.directive 'fineUpload', ($timeout) ->
 		return {
 			scope: {
 				multiple: "="
 				endpoint: "@"
-				waitingForResponseText: "@"
-				failedUploadText: "@"
-				uploadButtonText: "@"
-				dragAreaText: "@"
-				hintText: "@"
+				templateId: "@"
 				allowedExtensions: "="
 				onCompleteCallback: "="
 				onUploadCallback: "="
@@ -25,17 +22,12 @@ define [
 			link: (scope, element, attrs) ->
 				multiple = scope.multiple or false
 				endpoint = scope.endpoint
+				templateId = scope.templateId
 				if scope.allowedExtensions?
-					validation = 
+					validation =
 						allowedExtensions: scope.allowedExtensions
 				else
 					validation = {}
-				text =
-					waitingForResponse: scope.waitingForResponseText or "Processing..."
-					failUpload: scope.failedUploadText or "Failed :("
-					uploadButton: scope.uploadButtonText or "Upload"
-				dragAreaText = scope.dragAreaText or "drag here"
-				hintText = scope.hintText or ""
 				maxConnections = scope.maxConnections or 1
 				onComplete = scope.onCompleteCallback or () ->
 				onUpload   = scope.onUploadCallback or () ->
@@ -69,21 +61,8 @@ define [
 						onError: onError
 						onSubmit: onSubmit
 						onCancel: onCancel
-					text: text
-					template: """
-						<div class="qq-uploader">
-							<div class="qq-upload-drop-area"><span>{dragZoneText}</span></div>
-							<div class="qq-upload-button btn btn-primary btn-lg">
-								<div>{uploadButtonText}</div>
-							</div>
-							<span class="or btn-lg"> or </span>
-							<span class="drag-here btn-lg">#{dragAreaText}</span>
-							<span class="qq-drop-processing"><span>{dropProcessingText}</span><span class="qq-drop-processing-spinner"></span></span>
-							<div class="small">#{hintText}</div>
-							<ul class="qq-upload-list"></ul>
-						</div>
-					"""
+					template: templateId
 				window.q = q
 				scope.control?.q = q
 				return q
-		}
+		}

+ 9 - 9
services/web/public/coffee/ide.coffee

@@ -9,7 +9,7 @@ define [
 	"ide/pdf/PdfManager"
 	"ide/binary-files/BinaryFilesManager"
 	"ide/references/ReferencesManager"
-	"ide/labels/LabelsManager"
+	"ide/metadata/MetadataManager"
 	"ide/review-panel/ReviewPanelManager"
 	"ide/SafariScrollPatcher"
 	"ide/AutoCompileOnboardingController",
@@ -47,12 +47,12 @@ define [
 	PdfManager
 	BinaryFilesManager
 	ReferencesManager
-	LabelsManager
+	MetadataManager
 	ReviewPanelManager
 	SafariScrollPatcher
 ) ->
 
-	App.controller "IdeController", ($scope, $timeout, ide, localStorage, sixpack, event_tracking, labels) ->
+	App.controller "IdeController", ($scope, $timeout, ide, localStorage, sixpack, event_tracking, metadata) ->
 		# Don't freak out if we're already in an apply callback
 		$scope.$originalApply = $scope.$apply
 		$scope.$apply = (fn = () ->) ->
@@ -72,10 +72,10 @@ define [
 			view: "editor"
 			chatOpen: false
 			pdfLayout: 'sideBySide'
-			pdfHidden: false,
-			pdfWidth: 0,
-			reviewPanelOpen: localStorage("ui.reviewPanelOpen.#{window.project_id}"),
-			miniReviewPanelVisible: false,
+			pdfHidden: false
+			pdfWidth: 0
+			reviewPanelOpen: localStorage("ui.reviewPanelOpen.#{window.project_id}")
+			miniReviewPanelVisible: false
 		}
 		$scope.onboarding = {
 			autoCompile: if window.showAutoCompileOnboarding then 'unseen' else 'dismissed'
@@ -138,7 +138,7 @@ define [
 		ide.pdfManager = new PdfManager(ide, $scope)
 		ide.permissionsManager = new PermissionsManager(ide, $scope)
 		ide.binaryFilesManager = new BinaryFilesManager(ide, $scope)
-		ide.labelsManager = new LabelsManager(ide, $scope, labels)
+		ide.metadataManager = new MetadataManager(ide, $scope, metadata)
 
 		inited = false
 		$scope.$on "project:joined", () ->
@@ -153,7 +153,7 @@ define [
 			$timeout(
 				() ->
 					if $scope.permissions.write
-						ide.labelsManager.loadProjectLabelsFromServer()
+						ide.metadataManager.loadProjectMetaFromServer()
 						_labelsInitialLoadDone = true
 				, 200
 			)

+ 21 - 17
services/web/public/coffee/ide/editor/directives/aceEditor.coffee

@@ -9,11 +9,14 @@ define [
 	"ide/editor/directives/aceEditor/highlights/HighlightsManager"
 	"ide/editor/directives/aceEditor/cursor-position/CursorPositionManager"
 	"ide/editor/directives/aceEditor/track-changes/TrackChangesManager"
+	"ide/editor/directives/aceEditor/metadata/MetadataManager"
 	"ide/editor/directives/aceEditor/labels/LabelsManager"
 	"ide/labels/services/labels"
+	"ide/metadata/services/metadata"
 	"ide/graphics/services/graphics"
 	"ide/preamble/services/preamble"
-], (App, Ace, SearchBox, ModeList, UndoManager, AutoCompleteManager, SpellCheckManager, HighlightsManager, CursorPositionManager, TrackChangesManager, LabelsManager) ->
+    "ide/files/services/files"
+], (App, Ace, SearchBox, ModeList, UndoManager, AutoCompleteManager, SpellCheckManager, HighlightsManager, CursorPositionManager, TrackChangesManager, MetadataManager, LabelsManager) ->
 	EditSession = ace.require('ace/edit_session').EditSession
 	ModeList = ace.require('ace/ext/modelist')
 
@@ -35,7 +38,7 @@ define [
 			url = ace.config._moduleUrl(args...) + "?fingerprint=#{window.aceFingerprint}"
 			return url
 
-	App.directive "aceEditor", ($timeout, $compile, $rootScope, event_tracking, localStorage, $cacheFactory, labels, graphics, preamble, $http, $q) ->
+	App.directive "aceEditor", ($timeout, $compile, $rootScope, event_tracking, localStorage, $cacheFactory, labels, metadata, graphics, preamble, files, $http, $q) ->
 		monkeyPatchSearch($rootScope, $compile)
 
 		return  {
@@ -103,7 +106,8 @@ define [
 				cursorPositionManager = new CursorPositionManager(scope, editor, element, localStorage)
 				trackChangesManager   = new TrackChangesManager(scope, editor, element)
 				labelsManager = new LabelsManager(scope, editor, element, labels)
-				autoCompleteManager = new AutoCompleteManager(scope, editor, element, labelsManager, graphics, preamble)
+				metadataManager = new MetadataManager(scope, editor, element, metadata)
+				autoCompleteManager = new AutoCompleteManager(scope, editor, element, metadataManager, labelsManager, graphics, preamble, files)
 
 
 				# Prevert Ctrl|Cmd-S from triggering save dialog
@@ -115,16 +119,16 @@ define [
 				editor.commands.removeCommand "transposeletters"
 				editor.commands.removeCommand "showSettingsMenu"
 				editor.commands.removeCommand "foldall"
-				
+
 				# For European keyboards, the / is above 7 so needs Shift pressing.
-				# This comes through as Command-Shift-/ on OS X, which is mapped to 
+				# This comes through as Command-Shift-/ on OS X, which is mapped to
 				# toggleBlockComment.
 				# This doesn't do anything for LaTeX, so remap this to togglecomment to
 				# work for European keyboards as normal.
 				# On Windows, the key combo comes as Ctrl-Shift-7.
 				editor.commands.removeCommand "toggleBlockComment"
 				editor.commands.removeCommand "togglecomment"
-				
+
 				editor.commands.addCommand {
 					name: "togglecomment",
 					bindKey: { win: "Ctrl-/|Ctrl-Shift-7", mac: "Command-/|Command-Shift-/" },
@@ -140,7 +144,7 @@ define [
 					exec: (editor) ->
 						ace.require("ace/ext/searchbox").Search(editor, true)
 					readOnly: true
-				
+
 				# Bold text on CMD+B
 				editor.commands.addCommand
 					name: "bold",
@@ -154,7 +158,7 @@ define [
 							text = editor.getCopyText()
 							editor.insert("\\textbf{" + text + "}")
 					readOnly: false
-                    
+
 				# Italicise text on CMD+I
 				editor.commands.addCommand
 					name: "italics",
@@ -171,7 +175,7 @@ define [
 
 				scope.$watch "onCtrlEnter", (callback) ->
 					if callback?
-						editor.commands.addCommand 
+						editor.commands.addCommand
 							name: "compile",
 							bindKey: win: "Ctrl-Enter", mac: "Command-Enter"
 							exec: (editor) =>
@@ -180,7 +184,7 @@ define [
 
 				scope.$watch "onCtrlJ", (callback) ->
 					if callback?
-						editor.commands.addCommand 
+						editor.commands.addCommand
 							name: "toggle-review-panel",
 							bindKey: win: "Ctrl-J", mac: "Command-J"
 							exec: (editor) =>
@@ -189,7 +193,7 @@ define [
 
 				scope.$watch "onCtrlShiftC", (callback) ->
 					if callback?
-						editor.commands.addCommand 
+						editor.commands.addCommand
 							name: "add-new-comment",
 							bindKey: win: "Ctrl-Shift-C", mac: "Command-Shift-C"
 							exec: (editor) =>
@@ -198,7 +202,7 @@ define [
 
 				scope.$watch "onCtrlShiftA", (callback) ->
 					if callback?
-						editor.commands.addCommand 
+						editor.commands.addCommand
 							name: "toggle-track-changes",
 							bindKey: win: "Ctrl-Shift-A", mac: "Command-Shift-A"
 							exec: (editor) =>
@@ -302,7 +306,7 @@ define [
 					if updateCount == 100
 						event_tracking.send 'editor-interaction', 'multi-doc-update'
 					scope.$emit "#{scope.name}:change"
-				
+
 				onScroll = (scrollTop) ->
 					return if !scope.eventsBridge?
 					height = editor.renderer.layerConfig.maxHeight
@@ -311,7 +315,7 @@ define [
 				onScrollbarVisibilityChanged = (event, vRenderer) ->
 					return if !scope.eventsBridge?
 					scope.eventsBridge.emit "aceScrollbarVisibilityChanged", vRenderer.scrollBarV.isVisible, vRenderer.scrollBarV.width
-					
+
 				if scope.eventsBridge?
 					editor.renderer.on "scrollbarVisibilityChanged", onScrollbarVisibilityChanged
 
@@ -404,14 +408,14 @@ define [
 
 					session = editor.getSession()
 					session.off "changeScrollTop"
-					
+
 					doc = session.getDocument()
 					doc.off "change", onChange
-				
+
 				editor.renderer.on "changeCharacterSize", () ->
 					scope.$apply () ->
 						scope.rendererData.lineHeight = editor.renderer.lineHeight
-				
+
 				scope.$watch "rendererData", (rendererData) ->
 					if rendererData?
 						rendererData.lineHeight = editor.renderer.lineHeight

+ 44 - 17
services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee

@@ -1,16 +1,16 @@
 define [
 	"ide/editor/directives/aceEditor/auto-complete/CommandManager"
 	"ide/editor/directives/aceEditor/auto-complete/EnvironmentManager"
+	"ide/editor/directives/aceEditor/auto-complete/PackageManager"
 	"ide/editor/directives/aceEditor/auto-complete/Helpers"
 	"ace/ace"
 	"ace/ext-language_tools"
-], (CommandManager, EnvironmentManager, Helpers) ->
+], (CommandManager, EnvironmentManager, PackageManager, Helpers) ->
 	Range = ace.require("ace/range").Range
 	aceSnippetManager = ace.require('ace/snippets').snippetManager
 
 	class AutoCompleteManager
-		constructor: (@$scope, @editor, @element, @labelsManager, @graphics, @preamble) ->
-			@suggestionManager = new CommandManager()
+		constructor: (@$scope, @editor, @element, @metadataManager, @labelsManager, @graphics, @preamble, @files) ->
 
 			@monkeyPatchAutocomplete()
 
@@ -34,10 +34,15 @@ define [
 				enableLiveAutocompletion: false
 			})
 
+			commandCompleter = new CommandManager(@metadataManager)
+
 			SnippetCompleter = new EnvironmentManager()
+			PackageCompleter = new PackageManager()
 
 			Graphics = @graphics
 			Preamble = @preamble
+			Files = @files
+
 			GraphicsCompleter =
 				getCompletions: (editor, session, pos, prefix, callback) ->
 					context = Helpers.getContext(editor, pos)
@@ -63,7 +68,28 @@ define [
 								}
 							callback null, result
 
-			labelsManager = @labelsManager
+			metadataManager = @metadataManager
+			FilesCompleter =
+				getCompletions: (editor, session, pos, prefix, callback) =>
+					context = Helpers.getContext(editor, pos)
+					{lineUpToCursor, commandFragment, lineBeyondCursor, needsClosingBrace} = context
+					if commandFragment
+						match = commandFragment.match(/^\\(input|include){(\w*)/)
+						if match
+							commandName = match[1]
+							currentArg = match[2]
+							result = []
+							for file in Files.getTeXFiles()
+								if file.id != @$scope.docId
+									path = file.path
+									result.push {
+										caption: "\\#{commandName}{#{path}#{if needsClosingBrace then '}' else ''}",
+										value: "\\#{commandName}{#{path}#{if needsClosingBrace then '}' else ''}",
+										meta: "file",
+										score: 50
+									}
+							callback null, result
+
 			LabelsCompleter =
 				getCompletions: (editor, session, pos, prefix, callback) ->
 					context = Helpers.getContext(editor, pos)
@@ -74,13 +100,14 @@ define [
 							commandName = refMatch[1]
 							currentArg = refMatch[2]
 							result = []
-							result.push {
-								caption: "\\#{commandName}{}",
-								snippet: "\\#{commandName}{}",
-								meta: "cross-reference",
-								score: 60
-							}
-							for label in labelsManager.getAllLabels()
+							if commandName != 'ref' # ref is in top 100 commands
+								result.push {
+									caption: "\\#{commandName}{}",
+									snippet: "\\#{commandName}{}",
+									meta: "cross-reference",
+									score: 60
+								}
+							for label in metadataManager.getAllLabels()
 								result.push {
 									caption: "\\#{commandName}{#{label}#{if needsClosingBrace then '}' else ''}",
 									value: "\\#{commandName}{#{label}#{if needsClosingBrace then '}' else ''}",
@@ -126,11 +153,13 @@ define [
 								callback null, result
 
 			@editor.completers = [
-				@suggestionManager,
-				SnippetCompleter,
-				ReferencesCompleter,
-				LabelsCompleter,
+				commandCompleter
+				SnippetCompleter
+                PackageCompleter
+				ReferencesCompleter
+				LabelsCompleter
 				GraphicsCompleter
+				FilesCompleter
 			]
 
 		disable: () ->
@@ -152,8 +181,6 @@ define [
 			if lastTwoChars.match(/^\\[^a-zA-Z]$/)
 				@editor?.completer?.detach?()
 				return
-			if commandName in ['begin', 'end']
-				return
 			# Check that this change was made by us, not a collaborator
 			# (Cursor is still one place behind)
 			# NOTE: this is also the case when a user backspaces over a highlighted region

+ 18 - 83
services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee

@@ -1,81 +1,8 @@
-define [], () ->
-	noArgumentCommands = [
-		'item', 'hline', 'lipsum', 'centering', 'noindent', 'textwidth', 'draw',
-		'maketitle', 'newpage', 'verb', 'bibliography', 'hfill', 'par',
-		'in', 'sum', 'cdot', 'ldots', 'linewidth', 'left', 'right', 'today',
-		'clearpage', 'newline', 'endinput', 'tableofcontents', 'vfill',
-		'bigskip', 'fill', 'cleardoublepage', 'infty', 'leq', 'geq', 'times',
-		'alpha', 'beta', 'gamma', 'delta', 'epsilon', 'varepsilon', 'zeta',
-		'eta', 'theta', 'vartheta', 'iota', 'kappa', 'lambda', 'mu', 'nu', 'xi',
-		'pi', 'varpi', 'rho', 'varrho', 'sigma', 'varsigma', 'tau', 'upsilon',
-		'phi', 'varphi', 'chi', 'psi', 'omega', 'Gamma', 'Delta', 'Theta',
-		'Lambda', 'Xi', 'Pi', 'Sigma', 'Upsilon', 'Phi', 'Psi', 'Omega'
-	]
-	singleArgumentCommands = [
-		'chapter', 'usepackage', 'section', 'label', 'textbf', 'subsection',
-		'vspace', 'cite', 'textit', 'documentclass', 'includegraphics', 'input',
-		'emph','caption', 'ref', 'title', 'author', 'texttt', 'include',
-		'hspace', 'bibitem', 'url', 'large', 'subsubsection', 'textsc', 'date',
-		'footnote', 'small', 'thanks', 'underline', 'graphicspath', 'pageref',
-		'section*', 'subsection*', 'subsubsection*', 'sqrt', 'text',
-		'normalsize', 'footnotesize', 'Large', 'paragraph', 'pagestyle',
-		'thispagestyle', 'bibliographystyle', 'hat'
-	]
-	doubleArgumentCommands = [
-		'newcommand', 'frac', 'dfrac', 'renewcommand', 'setlength', 'href',
-		'newtheorem'
-	]
-	tripleArgumentCommands = [
-		'addcontentsline', 'newacronym', 'multicolumn'
-	]
-	special = ['LaTeX', 'TeX']
-
-	rawCommands = [].concat(
-		noArgumentCommands,
-		singleArgumentCommands,
-		doubleArgumentCommands,
-		tripleArgumentCommands,
-		special
-	)
-
-	noArgumentCommands = for cmd in noArgumentCommands
-		{
-			caption: "\\#{cmd}"
-			snippet: "\\#{cmd}"
-			meta: "cmd"
-		}
-	singleArgumentCommands = for cmd in singleArgumentCommands
-		{
-			caption: "\\#{cmd}{}"
-			snippet: "\\#{cmd}{$1}"
-			meta: "cmd"
-		}
-	doubleArgumentCommands = for cmd in doubleArgumentCommands
-		{
-			caption: "\\#{cmd}{}{}"
-			snippet: "\\#{cmd}{$1}{$2}"
-			meta: "cmd"
-		}
-	tripleArgumentCommands = for cmd in tripleArgumentCommands
-		{
-			caption: "\\#{cmd}{}{}{}"
-			snippet: "\\#{cmd}{$1}{$2}{$3}"
-			meta: "cmd"
-		}
-	special = for cmd in special
-			{
-				caption: "\\#{cmd}{}"
-				snippet: "\\#{cmd}{}"
-				meta: "cmd"
-			}
-
-	staticCommands = [].concat(
-						noArgumentCommands,
-						singleArgumentCommands,
-						doubleArgumentCommands,
-						tripleArgumentCommands,
-						special
-					)
+define [
+	"./top_hundred_snippets"
+], (topHundred) ->
+
+	commandNames = (snippet.caption.match(/\w+/)[0] for snippet in topHundred)
 
 	class Parser
 		constructor: (@doc, @prefix) ->
@@ -129,10 +56,10 @@ define [], () ->
 			return realCommands
 
 		# Ignore single letter commands since auto complete is moot then.
-		commandRegex: /\\([a-zA-Z][a-zA-Z]+)/
+		commandRegex: /\\([a-zA-Z]{2,})/
 
 		nextCommand: () ->
-			i = @doc.search(@commandRegex)
+			i = @doc.search @commandRegex
 			if i == -1
 				return false
 			else
@@ -166,13 +93,21 @@ define [], () ->
 				return false
 
 	class CommandManager
+		constructor: (@metadataManager) ->
+
 		getCompletions: (editor, session, pos, prefix, callback) ->
+			packages = @metadataManager.getAllPackages()
+			packageCommands = []
+			for pkg, snippets of packages
+				for snippet in snippets
+					packageCommands.push snippet
+
 			doc = session.getValue()
 			parser = new Parser(doc, prefix)
 			commands = parser.parse()
 			completions = []
 			for command in commands
-				if command[0] not in rawCommands
+				if command[0] not in commandNames
 					caption = "\\#{command[0]}"
 					score = if caption == prefix then 99 else 50
 					snippet = caption
@@ -191,9 +126,9 @@ define [], () ->
 						meta: "cmd"
 						score: score
 					}
-			completions = completions.concat staticCommands
+			completions = completions.concat topHundred, packageCommands
 
-			callback(null, completions)
+			callback null, completions
 
 		loadCommandsFromDoc: (doc) ->
 			parser = new Parser(doc)

+ 41 - 0
services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/PackageManager.coffee

@@ -0,0 +1,41 @@
+define () ->
+	packages = [
+		'inputenc', 'graphicx', 'amsmath', 'geometry', 'amssymb', 'hyperref',
+		'babel', 'color', 'xcolor', 'url', 'natbib', 'fontenc', 'fancyhdr',
+		'amsfonts', 'booktabs', 'amsthm', 'float', 'tikz', 'caption',
+		'setspace', 'multirow', 'array', 'multicol', 'titlesec', 'enumitem',
+		'ifthen', 'listings', 'blindtext', 'subcaption', 'times', 'bm',
+		'subfigure', 'algorithm', 'fontspec', 'biblatex', 'tabularx',
+		'microtype', 'etoolbox', 'parskip', 'calc', 'verbatim', 'mathtools',
+		'epsfig', 'wrapfig', 'lipsum', 'cite', 'textcomp', 'longtable',
+		'textpos', 'algpseudocode', 'enumerate', 'subfig', 'pdfpages',
+		'epstopdf', 'latexsym', 'lmodern', 'pifont', 'ragged2e', 'rotating',
+		'dcolumn', 'xltxtra', 'marvosym', 'indentfirst', 'xspace', 'csquotes',
+		'xparse', 'changepage', 'soul', 'xunicode', 'comment', 'mathrsfs',
+		'tocbibind', 'lastpage', 'algorithm2e', 'pgfplots', 'lineno',
+		'graphics', 'algorithmic', 'fullpage', 'mathptmx', 'todonotes',
+		'ulem', 'tweaklist', 'moderncvstyleclassic', 'collection',
+		'moderncvcompatibility', 'gensymb', 'helvet', 'siunitx', 'adjustbox',
+		'placeins', 'colortbl', 'appendix', 'makeidx', 'supertabular', 'ifpdf',
+		'framed', 'aliascnt', 'layaureo', 'authblk'
+	]
+
+	packageSnippets = for pkg in packages
+		{
+			caption: "\\usepackage{#{pkg}}"
+			snippet: "\\usepackage{#{pkg}}"
+			meta: "pkg"
+		}
+
+	packageSnippets.push {
+		caption: "\\usepackage{}"
+		snippet: "\\usepackage{$1}"
+		meta: "pkg"
+		score: 70
+	}
+
+	class PackageManager
+		getCompletions: (editor, session, pos, prefix, callback) ->
+			callback null, packageSnippets
+
+	return PackageManager

+ 691 - 0
services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/top_hundred_snippets.coffee

@@ -0,0 +1,691 @@
+define -> [{
+    "caption": "\\begin{}",
+    "snippet": "\\begin{$1}",
+    "meta": "cmd",
+    "score": 7.849662248028187
+}, {
+    "caption": "\\begin{}[]",
+    "snippet": "\\begin{$1}[$2]",
+    "meta": "cmd",
+    "score": 7.849662248028187
+}, {
+    "caption": "\\begin{}{}",
+    "snippet": "\\begin{$1}{$2}",
+    "meta": "cmd",
+    "score": 7.849662248028187
+}, {
+    "caption": "\\end{}",
+    "snippet": "\\end{$1}",
+    "meta": "cmd",
+    "score": 7.847906405228455
+}, {
+    "caption": "\\usepackage{}",
+    "snippet": "\\usepackage{$1}",
+    "meta": "cmd",
+    "score": 5.427890758130527
+}, {
+    "caption": "\\usepackage[]{}",
+    "snippet": "\\usepackage[$1]{$2}",
+    "meta": "cmd",
+    "score": 5.427890758130527
+}, {
+    "caption": "\\item",
+    "snippet": "\\item",
+    "meta": "cmd",
+    "score": 3.800886892251021
+}, {
+    "caption": "\\item[]",
+    "snippet": "\\item[$1]",
+    "meta": "cmd",
+    "score": 3.800886892251021
+}, {
+    "caption": "\\section{}",
+    "snippet": "\\section{$1}",
+    "meta": "cmd",
+    "score": 3.0952612541683835
+}, {
+    "caption": "\\textbf{}",
+    "snippet": "\\textbf{$1}",
+    "meta": "cmd",
+    "score": 2.627755982816738
+}, {
+    "caption": "\\cite{}",
+    "snippet": "\\cite{$1}",
+    "meta": "cmd",
+    "score": 2.341195220791228
+}, {
+    "caption": "\\label{}",
+    "snippet": "\\label{$1}",
+    "meta": "cmd",
+    "score": 1.897791904799601
+}, {
+    "caption": "\\textit{}",
+    "snippet": "\\textit{$1}",
+    "meta": "cmd",
+    "score": 1.6842996195493385
+}, {
+    "caption": "\\includegraphics[]{}",
+    "snippet": "\\includegraphics[$1]{$2}",
+    "meta": "cmd",
+    "score": 1.4595731795525781
+}, {
+    "caption": "\\documentclass[]{}",
+    "snippet": "\\documentclass[$1]{$2}",
+    "meta": "cmd",
+    "score": 1.4425339817971206
+}, {
+    "caption": "\\documentclass{}",
+    "snippet": "\\documentclass{$1}",
+    "meta": "cmd",
+    "score": 1.4425339817971206
+}, {
+    "caption": "\\frac{}{}",
+    "snippet": "\\frac{$1}{$2}",
+    "meta": "cmd",
+    "score": 1.4341091141105058
+}, {
+    "caption": "\\subsection{}",
+    "snippet": "\\subsection{$1}",
+    "meta": "cmd",
+    "score": 1.3890912739512353
+}, {
+    "caption": "\\hline",
+    "snippet": "\\hline",
+    "meta": "cmd",
+    "score": 1.3209538327406387
+}, {
+    "caption": "\\caption{}",
+    "snippet": "\\caption{$1}",
+    "meta": "cmd",
+    "score": 1.2569477427490174
+}, {
+    "caption": "\\centering",
+    "snippet": "\\centering",
+    "meta": "cmd",
+    "score": 1.1642881814937829
+}, {
+    "caption": "\\vspace{}",
+    "snippet": "\\vspace{$1}",
+    "meta": "cmd",
+    "score": 0.9533807826673939
+}, {
+    "caption": "\\title{}",
+    "snippet": "\\title{$1}",
+    "meta": "cmd",
+    "score": 0.9202908262245683
+}, {
+    "caption": "\\author{}",
+    "snippet": "\\author{$1}",
+    "meta": "cmd",
+    "score": 0.8973590434087177
+}, {
+    "caption": "\\author[]{}",
+    "snippet": "\\author[$1]{$2}",
+    "meta": "cmd",
+    "score": 0.8973590434087177
+}, {
+    "caption": "\\maketitle",
+    "snippet": "\\maketitle",
+    "meta": "cmd",
+    "score": 0.7504160124360846
+}, {
+    "caption": "\\textwidth",
+    "snippet": "\\textwidth",
+    "meta": "cmd",
+    "score": 0.7355328080889112
+}, {
+    "caption": "\\newcommand{}{}",
+    "snippet": "\\newcommand{$1}{$2}",
+    "meta": "cmd",
+    "score": 0.7264891987129375
+}, {
+    "caption": "\\newcommand{}[]{}",
+    "snippet": "\\newcommand{$1}[$2]{$3}",
+    "meta": "cmd",
+    "score": 0.7264891987129375
+}, {
+    "caption": "\\date{}",
+    "snippet": "\\date{$1}",
+    "meta": "cmd",
+    "score": 0.7225518453076786
+}, {
+    "caption": "\\emph{}",
+    "snippet": "\\emph{$1}",
+    "meta": "cmd",
+    "score": 0.7060308784832261
+}, {
+    "caption": "\\textsc{}",
+    "snippet": "\\textsc{$1}",
+    "meta": "cmd",
+    "score": 0.6926466355384758
+}, {
+    "caption": "\\multicolumn{}{}{}",
+    "snippet": "\\multicolumn{$1}{$2}{$3}",
+    "meta": "cmd",
+    "score": 0.5473606021405326
+}, {
+    "caption": "\\input{}",
+    "snippet": "\\input{$1}",
+    "meta": "cmd",
+    "score": 0.4966021927742672
+}, {
+    "caption": "\\alpha",
+    "snippet": "\\alpha",
+    "meta": "cmd",
+    "score": 0.49520006391384913
+}, {
+    "caption": "\\in",
+    "snippet": "\\in",
+    "meta": "cmd",
+    "score": 0.4716039670146658
+}, {
+    "caption": "\\mathbf{}",
+    "snippet": "\\mathbf{$1}",
+    "meta": "cmd",
+    "score": 0.4682018419466319
+}, {
+    "caption": "\\right",
+    "snippet": "\\right",
+    "meta": "cmd",
+    "score": 0.4299239459457309
+}, {
+    "caption": "\\left",
+    "snippet": "\\left",
+    "meta": "cmd",
+    "score": 0.42937815279867964
+}, {
+    "caption": "\\left[]",
+    "snippet": "\\left[$1]",
+    "meta": "cmd",
+    "score": 0.42937815279867964
+}, {
+    "caption": "\\sum",
+    "snippet": "\\sum",
+    "meta": "cmd",
+    "score": 0.42607994509619934
+}, {
+    "caption": "\\noindent",
+    "snippet": "\\noindent",
+    "meta": "cmd",
+    "score": 0.42355747798114207
+}, {
+    "caption": "\\chapter{}",
+    "snippet": "\\chapter{$1}",
+    "meta": "cmd",
+    "score": 0.422097569591803
+}, {
+    "caption": "\\par",
+    "snippet": "\\par",
+    "meta": "cmd",
+    "score": 0.413853376001159
+}, {
+    "caption": "\\lambda",
+    "snippet": "\\lambda",
+    "meta": "cmd",
+    "score": 0.39389600578684125
+}, {
+    "caption": "\\subsubsection{}",
+    "snippet": "\\subsubsection{$1}",
+    "meta": "cmd",
+    "score": 0.3727781330132016
+}, {
+    "caption": "\\bibitem{}",
+    "snippet": "\\bibitem{$1}",
+    "meta": "cmd",
+    "score": 0.3689547570562042
+}, {
+    "caption": "\\bibitem[]{}",
+    "snippet": "\\bibitem[$1]{$2}",
+    "meta": "cmd",
+    "score": 0.3689547570562042
+}, {
+    "caption": "\\text{}",
+    "snippet": "\\text{$1}",
+    "meta": "cmd",
+    "score": 0.3608680734736821
+}, {
+    "caption": "\\setlength{}{}",
+    "snippet": "\\setlength{$1}{$2}",
+    "meta": "cmd",
+    "score": 0.354445763583904
+}, {
+    "caption": "\\setlength",
+    "snippet": "\\setlength",
+    "meta": "cmd",
+    "score": 0.354445763583904
+}, {
+    "caption": "\\mathcal{}",
+    "snippet": "\\mathcal{$1}",
+    "meta": "cmd",
+    "score": 0.35084018920966636
+}, {
+    "caption": "\\newline",
+    "snippet": "\\newline",
+    "meta": "cmd",
+    "score": 0.3311721696201715
+}, {
+    "caption": "\\newpage",
+    "snippet": "\\newpage",
+    "meta": "cmd",
+    "score": 0.3277033727934986
+}, {
+    "caption": "\\renewcommand{}{}",
+    "snippet": "\\renewcommand{$1}{$2}",
+    "meta": "cmd",
+    "score": 0.3267437011085663
+}, {
+    "caption": "\\renewcommand",
+    "snippet": "\\renewcommand",
+    "meta": "cmd",
+    "score": 0.3267437011085663
+}, {
+    "caption": "\\theta",
+    "snippet": "\\theta",
+    "meta": "cmd",
+    "score": 0.3210417159232142
+}, {
+    "caption": "\\hspace{}",
+    "snippet": "\\hspace{$1}",
+    "meta": "cmd",
+    "score": 0.3147206476372336
+}, {
+    "caption": "\\beta",
+    "snippet": "\\beta",
+    "meta": "cmd",
+    "score": 0.3061799530337638
+}, {
+    "caption": "\\texttt{}",
+    "snippet": "\\texttt{$1}",
+    "meta": "cmd",
+    "score": 0.3019066753744355
+}, {
+    "caption": "\\times",
+    "snippet": "\\times",
+    "meta": "cmd",
+    "score": 0.2957960629411553
+}, {
+    "caption": "\\citep{}",
+    "snippet": "\\citep{$1}",
+    "meta": "cmd",
+    "score": 0.2941882834697057
+}, {
+    "caption": "\\color[]{}",
+    "snippet": "\\color[$1]{$2}",
+    "meta": "cmd",
+    "score": 0.2864294797053033
+}, {
+    "caption": "\\color{}",
+    "snippet": "\\color{$1}",
+    "meta": "cmd",
+    "score": 0.2864294797053033
+}, {
+    "caption": "\\mu",
+    "snippet": "\\mu",
+    "meta": "cmd",
+    "score": 0.27635652476799255
+}, {
+    "caption": "\\bibliography{}",
+    "snippet": "\\bibliography{$1}",
+    "meta": "cmd",
+    "score": 0.2659628337907604
+}, {
+    "caption": "\\linewidth",
+    "snippet": "\\linewidth",
+    "meta": "cmd",
+    "score": 0.2639498312518439
+}, {
+    "caption": "\\delta",
+    "snippet": "\\delta",
+    "meta": "cmd",
+    "score": 0.2620578600722735
+}, {
+    "caption": "\\sigma",
+    "snippet": "\\sigma",
+    "meta": "cmd",
+    "score": 0.25940147926344487
+}, {
+    "caption": "\\pi",
+    "snippet": "\\pi",
+    "meta": "cmd",
+    "score": 0.25920934567729714
+}, {
+    "caption": "\\hat{}",
+    "snippet": "\\hat{$1}",
+    "meta": "cmd",
+    "score": 0.25264309033778715
+}, {
+    "caption": "\\hat",
+    "snippet": "\\hat",
+    "meta": "cmd",
+    "score": 0.25264309033778715
+}, {
+    "caption": "\\bibliographystyle{}",
+    "snippet": "\\bibliographystyle{$1}",
+    "meta": "cmd",
+    "score": 0.25122317941387773
+}, {
+    "caption": "\\small",
+    "snippet": "\\small",
+    "meta": "cmd",
+    "score": 0.2447632045426295
+}, {
+    "caption": "\\small{}",
+    "snippet": "\\small{$1}",
+    "meta": "cmd",
+    "score": 0.2447632045426295
+}, {
+    "caption": "\\LaTeX",
+    "snippet": "\\LaTeX",
+    "meta": "cmd",
+    "score": 0.2334089308452787
+}, {
+    "caption": "\\LaTeX{}",
+    "snippet": "\\LaTeX{$1}",
+    "meta": "cmd",
+    "score": 0.2334089308452787
+}, {
+    "caption": "\\cdot",
+    "snippet": "\\cdot",
+    "meta": "cmd",
+    "score": 0.23029085545522762
+}, {
+    "caption": "\\footnote{}",
+    "snippet": "\\footnote{$1}",
+    "meta": "cmd",
+    "score": 0.2253056071787701
+}, {
+    "caption": "\\newtheorem{}[]{}",
+    "snippet": "\\newtheorem{$1}[$2]{$3}",
+    "meta": "cmd",
+    "score": 0.215689795055434
+}, {
+    "caption": "\\newtheorem{}{}",
+    "snippet": "\\newtheorem{$1}{$2}",
+    "meta": "cmd",
+    "score": 0.215689795055434
+}, {
+    "caption": "\\newtheorem{}{}[]",
+    "snippet": "\\newtheorem{$1}{$2}[$3]",
+    "meta": "cmd",
+    "score": 0.215689795055434
+}, {
+    "caption": "\\Delta",
+    "snippet": "\\Delta",
+    "meta": "cmd",
+    "score": 0.21386475063892618
+}, {
+    "caption": "\\tau",
+    "snippet": "\\tau",
+    "meta": "cmd",
+    "score": 0.21236188205859796
+}, {
+    "caption": "\\hfill",
+    "snippet": "\\hfill",
+    "meta": "cmd",
+    "score": 0.2058248088519886
+}, {
+    "caption": "\\leq",
+    "snippet": "\\leq",
+    "meta": "cmd",
+    "score": 0.20498894440637172
+}, {
+    "caption": "\\footnotesize",
+    "snippet": "\\footnotesize",
+    "meta": "cmd",
+    "score": 0.2038592081252624
+}, {
+    "caption": "\\footnotesize{}",
+    "snippet": "\\footnotesize{$1}",
+    "meta": "cmd",
+    "score": 0.2038592081252624
+}, {
+    "caption": "\\large",
+    "snippet": "\\large",
+    "meta": "cmd",
+    "score": 0.20377416734108866
+}, {
+    "caption": "\\large{}",
+    "snippet": "\\large{$1}",
+    "meta": "cmd",
+    "score": 0.20377416734108866
+}, {
+    "caption": "\\sqrt{}",
+    "snippet": "\\sqrt{$1}",
+    "meta": "cmd",
+    "score": 0.20240160977404634
+}, {
+    "caption": "\\epsilon",
+    "snippet": "\\epsilon",
+    "meta": "cmd",
+    "score": 0.2005136761359043
+}, {
+    "caption": "\\Large",
+    "snippet": "\\Large",
+    "meta": "cmd",
+    "score": 0.1987771081149759
+}, {
+    "caption": "\\Large{}",
+    "snippet": "\\Large{$1}",
+    "meta": "cmd",
+    "score": 0.1987771081149759
+}, {
+    "caption": "\\cvitem{}{}",
+    "snippet": "\\cvitem{$1}{$2}",
+    "meta": "cmd",
+    "score": 0.19605476980016281
+}, {
+    "caption": "\\rho",
+    "snippet": "\\rho",
+    "meta": "cmd",
+    "score": 0.1959287380541684
+}, {
+    "caption": "\\omega",
+    "snippet": "\\omega",
+    "meta": "cmd",
+    "score": 0.19326783415115262
+}, {
+    "caption": "\\mathrm{}",
+    "snippet": "\\mathrm{$1}",
+    "meta": "cmd",
+    "score": 0.19117752976172653
+}, {
+    "caption": "\\boldsymbol{}",
+    "snippet": "\\boldsymbol{$1}",
+    "meta": "cmd",
+    "score": 0.18137737738638837
+}, {
+    "caption": "\\boldsymbol",
+    "snippet": "\\boldsymbol",
+    "meta": "cmd",
+    "score": 0.18137737738638837
+}, {
+    "caption": "\\gamma",
+    "snippet": "\\gamma",
+    "meta": "cmd",
+    "score": 0.17940276535431304
+}, {
+    "caption": "\\clearpage",
+    "snippet": "\\clearpage",
+    "meta": "cmd",
+    "score": 0.1789117552185788
+}, {
+    "caption": "\\infty",
+    "snippet": "\\infty",
+    "meta": "cmd",
+    "score": 0.17837290019711305
+}, {
+    "caption": "\\phi",
+    "snippet": "\\phi",
+    "meta": "cmd",
+    "score": 0.17405809173097808
+}, {
+    "caption": "\\partial",
+    "snippet": "\\partial",
+    "meta": "cmd",
+    "score": 0.17168102367966637
+}, {
+    "caption": "\\include{}",
+    "snippet": "\\include{$1}",
+    "meta": "cmd",
+    "score": 0.1547080054979312
+}, {
+    "caption": "\\address{}",
+    "snippet": "\\address{$1}",
+    "meta": "cmd",
+    "score": 0.1525055392611109
+}, {
+    "caption": "\\address[]{}",
+    "snippet": "\\address[$1]{$2}",
+    "meta": "cmd",
+    "score": 0.1525055392611109
+}, {
+    "caption": "\\address{}{}{}",
+    "snippet": "\\address{$1}{$2}{$3}",
+    "meta": "cmd",
+    "score": 0.1525055392611109
+}, {
+    "caption": "\\quad",
+    "snippet": "\\quad",
+    "meta": "cmd",
+    "score": 0.15242755832392743
+}, {
+    "caption": "\\email{}",
+    "snippet": "\\email{$1}",
+    "meta": "cmd",
+    "score": 0.1522294670109857
+}, {
+    "caption": "\\paragraph{}",
+    "snippet": "\\paragraph{$1}",
+    "meta": "cmd",
+    "score": 0.152074250347974
+}, {
+    "caption": "\\varepsilon",
+    "snippet": "\\varepsilon",
+    "meta": "cmd",
+    "score": 0.05411564201390573
+}, {
+    "caption": "\\zeta",
+    "snippet": "\\zeta",
+    "meta": "cmd",
+    "score": 0.023330249803752954
+}, {
+    "caption": "\\eta",
+    "snippet": "\\eta",
+    "meta": "cmd",
+    "score": 0.11088718379889091
+}, {
+    "caption": "\\vartheta",
+    "snippet": "\\vartheta",
+    "meta": "cmd",
+    "score": 0.0025822992078068712
+}, {
+    "caption": "\\iota",
+    "snippet": "\\iota",
+    "meta": "cmd",
+    "score": 0.0024774003791525486
+}, {
+    "caption": "\\kappa",
+    "snippet": "\\kappa",
+    "meta": "cmd",
+    "score": 0.04887876299369008
+}, {
+    "caption": "\\nu",
+    "snippet": "\\nu",
+    "meta": "cmd",
+    "score": 0.09206962821059342
+}, {
+    "caption": "\\xi",
+    "snippet": "\\xi",
+    "meta": "cmd",
+    "score": 0.06496042899265699
+}, {
+    "caption": "\\varpi",
+    "snippet": "\\varpi",
+    "meta": "cmd",
+    "score": 0.0007039358167790341
+}, {
+    "caption": "\\varrho",
+    "snippet": "\\varrho",
+    "meta": "cmd",
+    "score": 0.0011279491613898612
+}, {
+    "caption": "\\varsigma",
+    "snippet": "\\varsigma",
+    "meta": "cmd",
+    "score": 0.0010424880711234978
+}, {
+    "caption": "\\varsigma{}",
+    "snippet": "\\varsigma{$1}",
+    "meta": "cmd",
+    "score": 0.0010424880711234978
+}, {
+    "caption": "\\upsilon",
+    "snippet": "\\upsilon",
+    "meta": "cmd",
+    "score": 0.00420715572598688
+}, {
+    "caption": "\\varphi",
+    "snippet": "\\varphi",
+    "meta": "cmd",
+    "score": 0.03351251516668212
+}, {
+    "caption": "\\chi",
+    "snippet": "\\chi",
+    "meta": "cmd",
+    "score": 0.043373492287805675
+}, {
+    "caption": "\\psi",
+    "snippet": "\\psi",
+    "meta": "cmd",
+    "score": 0.09994508706163642
+}, {
+    "caption": "\\Gamma",
+    "snippet": "\\Gamma",
+    "meta": "cmd",
+    "score": 0.04801549269801977
+}, {
+    "caption": "\\Theta",
+    "snippet": "\\Theta",
+    "meta": "cmd",
+    "score": 0.038090902146599444
+}, {
+    "caption": "\\Lambda",
+    "snippet": "\\Lambda",
+    "meta": "cmd",
+    "score": 0.032206594305977686
+}, {
+    "caption": "\\Xi",
+    "snippet": "\\Xi",
+    "meta": "cmd",
+    "score": 0.01060997225400494
+}, {
+    "caption": "\\Pi",
+    "snippet": "\\Pi",
+    "meta": "cmd",
+    "score": 0.021264671817473237
+}, {
+    "caption": "\\Sigma",
+    "snippet": "\\Sigma",
+    "meta": "cmd",
+    "score": 0.05769642802079917
+}, {
+    "caption": "\\Upsilon",
+    "snippet": "\\Upsilon",
+    "meta": "cmd",
+    "score": 0.00032875192955749566
+}, {
+    "caption": "\\Phi",
+    "snippet": "\\Phi",
+    "meta": "cmd",
+    "score": 0.0538724950042562
+}, {
+    "caption": "\\Psi",
+    "snippet": "\\Psi",
+    "meta": "cmd",
+    "score": 0.03056589143021648
+}, {
+    "caption": "\\Omega",
+    "snippet": "\\Omega",
+    "meta": "cmd",
+    "score": 0.09490387997853639
+}]

+ 85 - 0
services/web/public/coffee/ide/editor/directives/aceEditor/metadata/MetadataManager.coffee

@@ -0,0 +1,85 @@
+define [
+	"ace/ace"
+], () ->
+	Range = ace.require("ace/range").Range
+
+	getLastCommandFragment = (lineUpToCursor) ->
+		if m = lineUpToCursor.match(/(\\[^\\]+)$/)
+			return m[1]
+		else
+			return null
+
+	class MetadataManager
+		constructor: (@$scope, @editor, @element, @Metadata) ->
+			@debouncer = {}  # DocId => Timeout
+
+			onChange = (change) =>
+				if change.remote
+					return
+				if change.action not in ['remove', 'insert']
+					return
+				cursorPosition = @editor.getCursorPosition()
+				end = change.end
+				range = new Range(end.row, 0, end.row, end.column)
+				lineUpToCursor = @editor.getSession().getTextRange range
+				if lineUpToCursor.trim() == '%' or lineUpToCursor.slice(0, 1) == '\\'
+					range = new Range(end.row, 0, end.row, end.column + 80)
+					lineUpToCursor = @editor.getSession().getTextRange range
+				commandFragment = getLastCommandFragment lineUpToCursor
+
+				linesContainPackage = _.any(
+					change.lines,
+					(line) -> line.match(/^\\usepackage(?:\[.{0,80}?])?{(.{0,80}?)}/)
+				)
+				linesContainReqPackage = _.any(
+					change.lines,
+					(line) -> line.match(/^\\RequirePackage(?:\[.{0,80}?])?{(.{0,80}?)}/)
+				)
+				linesContainLabel = _.any(
+					change.lines,
+					(line) -> line.match(/\\label{(.{0,80}?)}/)
+				)
+				linesContainMeta =
+					linesContainPackage or
+					linesContainLabel or
+					linesContainReqPackage
+
+				lastCommandFragmentIsLabel = commandFragment?.slice(0, 7) == '\\label{'
+				lastCommandFragmentIsPackage = commandFragment?.slice(0, 11) == '\\usepackage'
+				lastCommandFragmentIsReqPack = commandFragment?.slice(0, 15) == '\\RequirePackage'
+				lastCommandFragmentIsMeta =
+					lastCommandFragmentIsPackage or
+					lastCommandFragmentIsLabel or
+					lastCommandFragmentIsReqPack
+
+				if linesContainMeta or lastCommandFragmentIsMeta
+					@scheduleLoadCurrentDocMetaFromServer()
+
+			@editor.on "changeSession", (e) =>
+				e.oldSession.off "change", onChange
+				e.session.on "change", onChange
+
+
+		loadDocMetaFromServer: (docId) ->
+			@Metadata.loadDocMetaFromServer docId
+
+		scheduleLoadCurrentDocMetaFromServer: () ->
+			# De-bounce loading labels with a timeout
+			currentDocId = @$scope.docId
+			existingTimeout = @debouncer[currentDocId]
+			if existingTimeout?
+				clearTimeout(existingTimeout)
+				delete @debouncer[currentDocId]
+			@debouncer[currentDocId] = setTimeout(
+				() =>
+					@loadDocMetaFromServer currentDocId
+					delete @debouncer[currentDocId]
+				, 1000
+				, this
+			)
+
+		getAllLabels: () ->
+			@Metadata.getAllLabels()
+
+		getAllPackages: () ->
+			@Metadata.getAllPackages()

+ 16 - 16
services/web/public/coffee/ide/file-tree/FileTreeManager.coffee

@@ -13,15 +13,15 @@ define [
 				@loadRootFolder()
 				@loadDeletedDocs()
 				@$scope.$emit "file-tree:initialized"
-				
+
 			@$scope.$watch "rootFolder", (rootFolder) =>
 				if rootFolder?
 					@recalculateDocList()
 
 			@_bindToSocketEvents()
-			
+
 			@$scope.multiSelectedCount = 0
-			
+
 			$(document).on "click", =>
 				@clearMultiSelectedEntities()
 				$scope.$digest()
@@ -46,7 +46,7 @@ define [
 						type: "file"
 					}
 					@recalculateDocList()
-					
+
 			@ide.socket.on "reciveNewFolder", (parent_folder_id, folder) =>
 				parent_folder = @findEntityById(parent_folder_id) or @$scope.rootFolder
 				@$scope.$apply () =>
@@ -85,25 +85,25 @@ define [
 			@ide.fileTreeManager.forEachEntity (entity) ->
 				entity.selected = false
 			entity.selected = true
-		
+
 		toggleMultiSelectEntity: (entity) ->
 			entity.multiSelected = !entity.multiSelected
 			@$scope.multiSelectedCount = @multiSelectedCount()
-		
+
 		multiSelectedCount: () ->
 			count = 0
 			@forEachEntity (entity) ->
 				if entity.multiSelected
 					count++
 			return count
-		
+
 		getMultiSelectedEntities: () ->
 			entities = []
 			@forEachEntity (e) ->
 				if e.multiSelected
 					entities.push e
 			return entities
-		
+
 		getMultiSelectedEntityChildNodes: () ->
 			entities = @getMultiSelectedEntities()
 			paths = {}
@@ -125,13 +125,13 @@ define [
 				if !prefixes[path]?
 					child_entities.push entity
 			return child_entities
-		
+
 		clearMultiSelectedEntities: () ->
 			return if @$scope.multiSelectedCount == 0 # Be efficient, this is called a lot on 'click'
 			@forEachEntity (entity) ->
 				entity.multiSelected = false
 			@$scope.multiSelectedCount = 0
-		
+
 		multiSelectSelectedEntity: () ->
 			@findSelectedEntity()?.multiSelected = true
 
@@ -140,7 +140,7 @@ define [
 			return false if !folder?
 			entity = @_findEntityByPathInFolder(folder, name)
 			return entity?
-			
+
 		findSelectedEntity: () ->
 			selected = null
 			@forEachEntity (entity) ->
@@ -178,7 +178,7 @@ define [
 			parts = path.split("/")
 			name = parts.shift()
 			rest = parts.join("/")
-			
+
 			if name == "."
 				return @_findEntityByPathInFolder(folder, rest)
 
@@ -268,7 +268,7 @@ define [
 					type: "doc"
 					deleted: true
 				}
-				
+
 		recalculateDocList: () ->
 			@$scope.docs = []
 			@forEachEntity (entity, parentFolder, path) =>
@@ -287,7 +287,7 @@ define [
 					return -1
 				else
 					return 1
-			
+
 		getEntityPath: (entity) ->
 			@_getEntityPathInFolder @$scope.rootFolder, entity
 
@@ -349,7 +349,7 @@ define [
 			}
 
 		deleteEntity: (entity, callback = (error) ->) ->
-			# We'll wait for the socket.io notification to 
+			# We'll wait for the socket.io notification to
 			# delete from scope.
 			return @ide.queuedHttp {
 				method: "DELETE"
@@ -367,7 +367,7 @@ define [
 				folder_id: parent_folder.id
 				_csrf: window.csrfToken
 			}
-			
+
 		_isChildFolder: (parent_folder, child_folder) ->
 			parent_path = @getEntityPath(parent_folder) or "" # null if root folder
 			child_path = @getEntityPath(child_folder) or "" # null if root folder

+ 17 - 0
services/web/public/coffee/ide/files/services/files.coffee

@@ -0,0 +1,17 @@
+define [
+	"base"
+], (App) ->
+
+	App.factory 'files', (ide) ->
+
+		Files =
+			getTeXFiles: () ->
+				texFiles = []
+				ide.fileTreeManager.forEachEntity (entity, folder, path) ->
+					if entity.type == 'doc' && entity?.name?.match?(/.*\.(tex|txt|md)/)
+						cloned = _.clone(entity)
+						cloned.path = path
+						texFiles.push cloned
+				return texFiles
+
+		return Files

+ 1 - 2
services/web/public/coffee/ide/labels/LabelsManager.coffee

@@ -1,5 +1,4 @@
-define [
-], () ->
+define [], () ->
 
 	class LabelsManager
 

+ 13 - 0
services/web/public/coffee/ide/metadata/MetadataManager.coffee

@@ -0,0 +1,13 @@
+define [], () ->
+
+	class MetadataManager
+
+		constructor: (@ide, @$scope, @metadata) ->
+
+			@ide.socket.on 'broadcastDocMeta', (data) =>
+				@metadata.onBroadcastDocMeta data
+			@$scope.$on 'entity:deleted', @metadata.onEntityDeleted
+			@$scope.$on 'file:upload:complete', @metadata.fileUploadComplete
+
+		loadProjectMetaFromServer: () ->
+			@metadata.loadProjectMetaFromServer()

+ 49 - 0
services/web/public/coffee/ide/metadata/services/metadata.coffee

@@ -0,0 +1,49 @@
+define [
+	"base"
+], (App) ->
+
+	App.factory 'metadata', ($http, ide) ->
+
+		state = {documents: {}}
+
+		metadata = {state: state}
+
+		metadata.onBroadcastDocMeta = (data) ->
+			if data.docId? and data.meta?
+				state.documents[data.docId] = data.meta
+
+		metadata.onEntityDeleted = (e, entity) ->
+			if entity.type == 'doc'
+				delete state.documents[entity.id]
+
+		metadata.onFileUploadComplete = (e, upload) ->
+			if upload.entity_type == 'doc'
+				metadata.loadDocMetaFromServer upload.entity_id
+
+		metadata.getAllLabels = () ->
+			_.flatten(meta.labels for docId, meta of state.documents)
+
+		metadata.getAllPackages = () ->
+			packageCommandMapping = {}
+			for _docId, meta of state.documents
+				for packageName, commandSnippets of meta.packages
+					packageCommandMapping[packageName] = commandSnippets
+			return packageCommandMapping
+
+		metadata.loadProjectMetaFromServer = () ->
+			$http
+				.get("/project/#{window.project_id}/metadata")
+				.then (response) ->
+					{ data } = response
+					if data.projectMeta
+						for docId, docMeta of data.projectMeta
+							state.documents[docId] = docMeta
+
+		metadata.loadDocMetaFromServer = (docId) ->
+			$http
+				.post(
+					"/project/#{window.project_id}/doc/#{docId}/metadata",
+					{_csrf: window.csrfToken}
+				)
+
+		return metadata

+ 0 - 2
services/web/public/coffee/libs.coffee

@@ -1,12 +1,10 @@
 define [
-	"moment"
 	"libs/angular-autocomplete/angular-autocomplete"
 	"libs/ui-bootstrap"
 	"libs/ng-context-menu-0.1.4"
 	"libs/underscore-1.3.3"
 	"libs/algolia-2.5.2"
 	"libs/jquery.storage"
-	"libs/fineuploader"
 	"libs/angular-sanitize-1.2.17"
 	"libs/angular-cookie"
 	"libs/passfield"

+ 8 - 8
services/web/public/js/ace-1.2.5/mode-latex.js

@@ -4,7 +4,7 @@ ace.define("ace/mode/latex_highlight_rules",["require","exports","module","ace/l
 var oop = require("../lib/oop");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
-var LatexHighlightRules = function() {  
+var LatexHighlightRules = function() {
 
     this.$rules = {
         "start" : [{
@@ -47,9 +47,9 @@ var LatexHighlightRules = function() {
             token : "constant.character.escape",
             regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)"
         }, {
-            token : "error", 
-            regex : "^\\s*$", 
-            next : "start" 
+            token : "error",
+            regex : "^\\s*$",
+            next : "start"
         }, {
             defaultToken : "string"
         }]
@@ -76,16 +76,16 @@ oop.inherits(FoldMode, BaseFoldMode);
 
 (function() {
 
-    this.foldingStartMarker = /^\s*\\(begin)|(section|subsection|paragraph)\b|{\s*$/;
+    this.foldingStartMarker = /^\s*\\(begin|section|subsection|subsubsection|paragraph|part|chapter)\b|{\s*$/;
     this.foldingStopMarker = /^\s*\\(end)\b|^\s*}/;
 
     this.getFoldWidgetRange = function(session, foldStyle, row) {
         var line = session.doc.getLine(row);
         var match = this.foldingStartMarker.exec(line);
         if (match) {
-            if (match[1])
+            if (match[1] === "begin")
                 return this.latexBlock(session, row, match[0].length - 1);
-            if (match[2])
+            else if (match[1])
                 return this.latexSection(session, row, match[0].length - 1);
 
             return this.openingBracketBlock(session, "{", row, match.index);
@@ -153,7 +153,7 @@ oop.inherits(FoldMode, BaseFoldMode);
     };
 
     this.latexSection = function(session, row, column) {
-        var keywords = ["\\subsection", "\\section", "\\begin", "\\end", "\\paragraph"];
+        var keywords = ["\\subsection", "\\section", "\\begin", "\\end", "\\paragraph", "\\part", "\\chapter"];
 
         var stream = new TokenIterator(session, row, column);
         var token = stream.getCurrentToken();

+ 7455 - 0
services/web/public/js/libs/fineuploader-5.15.4.js

@@ -0,0 +1,7455 @@
+// Fine Uploader 5.15.4 - MIT licensed. http://fineuploader.com
+(function(global) {
+    var qq = function(element) {
+        "use strict";
+        return {
+            hide: function() {
+                element.style.display = "none";
+                return this;
+            },
+            attach: function(type, fn) {
+                if (element.addEventListener) {
+                    element.addEventListener(type, fn, false);
+                } else if (element.attachEvent) {
+                    element.attachEvent("on" + type, fn);
+                }
+                return function() {
+                    qq(element).detach(type, fn);
+                };
+            },
+            detach: function(type, fn) {
+                if (element.removeEventListener) {
+                    element.removeEventListener(type, fn, false);
+                } else if (element.attachEvent) {
+                    element.detachEvent("on" + type, fn);
+                }
+                return this;
+            },
+            contains: function(descendant) {
+                if (!descendant) {
+                    return false;
+                }
+                if (element === descendant) {
+                    return true;
+                }
+                if (element.contains) {
+                    return element.contains(descendant);
+                } else {
+                    return !!(descendant.compareDocumentPosition(element) & 8);
+                }
+            },
+            insertBefore: function(elementB) {
+                elementB.parentNode.insertBefore(element, elementB);
+                return this;
+            },
+            remove: function() {
+                element.parentNode.removeChild(element);
+                return this;
+            },
+            css: function(styles) {
+                if (element.style == null) {
+                    throw new qq.Error("Can't apply style to node as it is not on the HTMLElement prototype chain!");
+                }
+                if (styles.opacity != null) {
+                    if (typeof element.style.opacity !== "string" && typeof element.filters !== "undefined") {
+                        styles.filter = "alpha(opacity=" + Math.round(100 * styles.opacity) + ")";
+                    }
+                }
+                qq.extend(element.style, styles);
+                return this;
+            },
+            hasClass: function(name, considerParent) {
+                var re = new RegExp("(^| )" + name + "( |$)");
+                return re.test(element.className) || !!(considerParent && re.test(element.parentNode.className));
+            },
+            addClass: function(name) {
+                if (!qq(element).hasClass(name)) {
+                    element.className += " " + name;
+                }
+                return this;
+            },
+            removeClass: function(name) {
+                var re = new RegExp("(^| )" + name + "( |$)");
+                element.className = element.className.replace(re, " ").replace(/^\s+|\s+$/g, "");
+                return this;
+            },
+            getByClass: function(className, first) {
+                var candidates, result = [];
+                if (first && element.querySelector) {
+                    return element.querySelector("." + className);
+                } else if (element.querySelectorAll) {
+                    return element.querySelectorAll("." + className);
+                }
+                candidates = element.getElementsByTagName("*");
+                qq.each(candidates, function(idx, val) {
+                    if (qq(val).hasClass(className)) {
+                        result.push(val);
+                    }
+                });
+                return first ? result[0] : result;
+            },
+            getFirstByClass: function(className) {
+                return qq(element).getByClass(className, true);
+            },
+            children: function() {
+                var children = [], child = element.firstChild;
+                while (child) {
+                    if (child.nodeType === 1) {
+                        children.push(child);
+                    }
+                    child = child.nextSibling;
+                }
+                return children;
+            },
+            setText: function(text) {
+                element.innerText = text;
+                element.textContent = text;
+                return this;
+            },
+            clearText: function() {
+                return qq(element).setText("");
+            },
+            hasAttribute: function(attrName) {
+                var attrVal;
+                if (element.hasAttribute) {
+                    if (!element.hasAttribute(attrName)) {
+                        return false;
+                    }
+                    return /^false$/i.exec(element.getAttribute(attrName)) == null;
+                } else {
+                    attrVal = element[attrName];
+                    if (attrVal === undefined) {
+                        return false;
+                    }
+                    return /^false$/i.exec(attrVal) == null;
+                }
+            }
+        };
+    };
+    (function() {
+        "use strict";
+        qq.canvasToBlob = function(canvas, mime, quality) {
+            return qq.dataUriToBlob(canvas.toDataURL(mime, quality));
+        };
+        qq.dataUriToBlob = function(dataUri) {
+            var arrayBuffer, byteString, createBlob = function(data, mime) {
+                var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder, blobBuilder = BlobBuilder && new BlobBuilder();
+                if (blobBuilder) {
+                    blobBuilder.append(data);
+                    return blobBuilder.getBlob(mime);
+                } else {
+                    return new Blob([ data ], {
+                        type: mime
+                    });
+                }
+            }, intArray, mimeString;
+            if (dataUri.split(",")[0].indexOf("base64") >= 0) {
+                byteString = atob(dataUri.split(",")[1]);
+            } else {
+                byteString = decodeURI(dataUri.split(",")[1]);
+            }
+            mimeString = dataUri.split(",")[0].split(":")[1].split(";")[0];
+            arrayBuffer = new ArrayBuffer(byteString.length);
+            intArray = new Uint8Array(arrayBuffer);
+            qq.each(byteString, function(idx, character) {
+                intArray[idx] = character.charCodeAt(0);
+            });
+            return createBlob(arrayBuffer, mimeString);
+        };
+        qq.log = function(message, level) {
+            if (window.console) {
+                if (!level || level === "info") {
+                    window.console.log(message);
+                } else {
+                    if (window.console[level]) {
+                        window.console[level](message);
+                    } else {
+                        window.console.log("<" + level + "> " + message);
+                    }
+                }
+            }
+        };
+        qq.isObject = function(variable) {
+            return variable && !variable.nodeType && Object.prototype.toString.call(variable) === "[object Object]";
+        };
+        qq.isFunction = function(variable) {
+            return typeof variable === "function";
+        };
+        qq.isArray = function(value) {
+            return Object.prototype.toString.call(value) === "[object Array]" || value && window.ArrayBuffer && value.buffer && value.buffer.constructor === ArrayBuffer;
+        };
+        qq.isItemList = function(maybeItemList) {
+            return Object.prototype.toString.call(maybeItemList) === "[object DataTransferItemList]";
+        };
+        qq.isNodeList = function(maybeNodeList) {
+            return Object.prototype.toString.call(maybeNodeList) === "[object NodeList]" || maybeNodeList.item && maybeNodeList.namedItem;
+        };
+        qq.isString = function(maybeString) {
+            return Object.prototype.toString.call(maybeString) === "[object String]";
+        };
+        qq.trimStr = function(string) {
+            if (String.prototype.trim) {
+                return string.trim();
+            }
+            return string.replace(/^\s+|\s+$/g, "");
+        };
+        qq.format = function(str) {
+            var args = Array.prototype.slice.call(arguments, 1), newStr = str, nextIdxToReplace = newStr.indexOf("{}");
+            qq.each(args, function(idx, val) {
+                var strBefore = newStr.substring(0, nextIdxToReplace), strAfter = newStr.substring(nextIdxToReplace + 2);
+                newStr = strBefore + val + strAfter;
+                nextIdxToReplace = newStr.indexOf("{}", nextIdxToReplace + val.length);
+                if (nextIdxToReplace < 0) {
+                    return false;
+                }
+            });
+            return newStr;
+        };
+        qq.isFile = function(maybeFile) {
+            return window.File && Object.prototype.toString.call(maybeFile) === "[object File]";
+        };
+        qq.isFileList = function(maybeFileList) {
+            return window.FileList && Object.prototype.toString.call(maybeFileList) === "[object FileList]";
+        };
+        qq.isFileOrInput = function(maybeFileOrInput) {
+            return qq.isFile(maybeFileOrInput) || qq.isInput(maybeFileOrInput);
+        };
+        qq.isInput = function(maybeInput, notFile) {
+            var evaluateType = function(type) {
+                var normalizedType = type.toLowerCase();
+                if (notFile) {
+                    return normalizedType !== "file";
+                }
+                return normalizedType === "file";
+            };
+            if (window.HTMLInputElement) {
+                if (Object.prototype.toString.call(maybeInput) === "[object HTMLInputElement]") {
+                    if (maybeInput.type && evaluateType(maybeInput.type)) {
+                        return true;
+                    }
+                }
+            }
+            if (maybeInput.tagName) {
+                if (maybeInput.tagName.toLowerCase() === "input") {
+                    if (maybeInput.type && evaluateType(maybeInput.type)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
+        qq.isBlob = function(maybeBlob) {
+            if (window.Blob && Object.prototype.toString.call(maybeBlob) === "[object Blob]") {
+                return true;
+            }
+        };
+        qq.isXhrUploadSupported = function() {
+            var input = document.createElement("input");
+            input.type = "file";
+            return input.multiple !== undefined && typeof File !== "undefined" && typeof FormData !== "undefined" && typeof qq.createXhrInstance().upload !== "undefined";
+        };
+        qq.createXhrInstance = function() {
+            if (window.XMLHttpRequest) {
+                return new XMLHttpRequest();
+            }
+            try {
+                return new ActiveXObject("MSXML2.XMLHTTP.3.0");
+            } catch (error) {
+                qq.log("Neither XHR or ActiveX are supported!", "error");
+                return null;
+            }
+        };
+        qq.isFolderDropSupported = function(dataTransfer) {
+            return dataTransfer.items && dataTransfer.items.length > 0 && dataTransfer.items[0].webkitGetAsEntry;
+        };
+        qq.isFileChunkingSupported = function() {
+            return !qq.androidStock() && qq.isXhrUploadSupported() && (File.prototype.slice !== undefined || File.prototype.webkitSlice !== undefined || File.prototype.mozSlice !== undefined);
+        };
+        qq.sliceBlob = function(fileOrBlob, start, end) {
+            var slicer = fileOrBlob.slice || fileOrBlob.mozSlice || fileOrBlob.webkitSlice;
+            return slicer.call(fileOrBlob, start, end);
+        };
+        qq.arrayBufferToHex = function(buffer) {
+            var bytesAsHex = "", bytes = new Uint8Array(buffer);
+            qq.each(bytes, function(idx, byt) {
+                var byteAsHexStr = byt.toString(16);
+                if (byteAsHexStr.length < 2) {
+                    byteAsHexStr = "0" + byteAsHexStr;
+                }
+                bytesAsHex += byteAsHexStr;
+            });
+            return bytesAsHex;
+        };
+        qq.readBlobToHex = function(blob, startOffset, length) {
+            var initialBlob = qq.sliceBlob(blob, startOffset, startOffset + length), fileReader = new FileReader(), promise = new qq.Promise();
+            fileReader.onload = function() {
+                promise.success(qq.arrayBufferToHex(fileReader.result));
+            };
+            fileReader.onerror = promise.failure;
+            fileReader.readAsArrayBuffer(initialBlob);
+            return promise;
+        };
+        qq.extend = function(first, second, extendNested) {
+            qq.each(second, function(prop, val) {
+                if (extendNested && qq.isObject(val)) {
+                    if (first[prop] === undefined) {
+                        first[prop] = {};
+                    }
+                    qq.extend(first[prop], val, true);
+                } else {
+                    first[prop] = val;
+                }
+            });
+            return first;
+        };
+        qq.override = function(target, sourceFn) {
+            var super_ = {}, source = sourceFn(super_);
+            qq.each(source, function(srcPropName, srcPropVal) {
+                if (target[srcPropName] !== undefined) {
+                    super_[srcPropName] = target[srcPropName];
+                }
+                target[srcPropName] = srcPropVal;
+            });
+            return target;
+        };
+        qq.indexOf = function(arr, elt, from) {
+            if (arr.indexOf) {
+                return arr.indexOf(elt, from);
+            }
+            from = from || 0;
+            var len = arr.length;
+            if (from < 0) {
+                from += len;
+            }
+            for (;from < len; from += 1) {
+                if (arr.hasOwnProperty(from) && arr[from] === elt) {
+                    return from;
+                }
+            }
+            return -1;
+        };
+        qq.getUniqueId = function() {
+            return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+                var r = Math.random() * 16 | 0, v = c == "x" ? r : r & 3 | 8;
+                return v.toString(16);
+            });
+        };
+        qq.ie = function() {
+            return navigator.userAgent.indexOf("MSIE") !== -1 || navigator.userAgent.indexOf("Trident") !== -1;
+        };
+        qq.ie7 = function() {
+            return navigator.userAgent.indexOf("MSIE 7") !== -1;
+        };
+        qq.ie8 = function() {
+            return navigator.userAgent.indexOf("MSIE 8") !== -1;
+        };
+        qq.ie10 = function() {
+            return navigator.userAgent.indexOf("MSIE 10") !== -1;
+        };
+        qq.ie11 = function() {
+            return qq.ie() && navigator.userAgent.indexOf("rv:11") !== -1;
+        };
+        qq.edge = function() {
+            return navigator.userAgent.indexOf("Edge") >= 0;
+        };
+        qq.safari = function() {
+            return navigator.vendor !== undefined && navigator.vendor.indexOf("Apple") !== -1;
+        };
+        qq.chrome = function() {
+            return navigator.vendor !== undefined && navigator.vendor.indexOf("Google") !== -1;
+        };
+        qq.opera = function() {
+            return navigator.vendor !== undefined && navigator.vendor.indexOf("Opera") !== -1;
+        };
+        qq.firefox = function() {
+            return !qq.edge() && !qq.ie11() && navigator.userAgent.indexOf("Mozilla") !== -1 && navigator.vendor !== undefined && navigator.vendor === "";
+        };
+        qq.windows = function() {
+            return navigator.platform === "Win32";
+        };
+        qq.android = function() {
+            return navigator.userAgent.toLowerCase().indexOf("android") !== -1;
+        };
+        qq.androidStock = function() {
+            return qq.android() && navigator.userAgent.toLowerCase().indexOf("chrome") < 0;
+        };
+        qq.ios6 = function() {
+            return qq.ios() && navigator.userAgent.indexOf(" OS 6_") !== -1;
+        };
+        qq.ios7 = function() {
+            return qq.ios() && navigator.userAgent.indexOf(" OS 7_") !== -1;
+        };
+        qq.ios8 = function() {
+            return qq.ios() && navigator.userAgent.indexOf(" OS 8_") !== -1;
+        };
+        qq.ios800 = function() {
+            return qq.ios() && navigator.userAgent.indexOf(" OS 8_0 ") !== -1;
+        };
+        qq.ios = function() {
+            return navigator.userAgent.indexOf("iPad") !== -1 || navigator.userAgent.indexOf("iPod") !== -1 || navigator.userAgent.indexOf("iPhone") !== -1;
+        };
+        qq.iosChrome = function() {
+            return qq.ios() && navigator.userAgent.indexOf("CriOS") !== -1;
+        };
+        qq.iosSafari = function() {
+            return qq.ios() && !qq.iosChrome() && navigator.userAgent.indexOf("Safari") !== -1;
+        };
+        qq.iosSafariWebView = function() {
+            return qq.ios() && !qq.iosChrome() && !qq.iosSafari();
+        };
+        qq.preventDefault = function(e) {
+            if (e.preventDefault) {
+                e.preventDefault();
+            } else {
+                e.returnValue = false;
+            }
+        };
+        qq.toElement = function() {
+            var div = document.createElement("div");
+            return function(html) {
+                div.innerHTML = html;
+                var element = div.firstChild;
+                div.removeChild(element);
+                return element;
+            };
+        }();
+        qq.each = function(iterableItem, callback) {
+            var keyOrIndex, retVal;
+            if (iterableItem) {
+                if (window.Storage && iterableItem.constructor === window.Storage) {
+                    for (keyOrIndex = 0; keyOrIndex < iterableItem.length; keyOrIndex++) {
+                        retVal = callback(iterableItem.key(keyOrIndex), iterableItem.getItem(iterableItem.key(keyOrIndex)));
+                        if (retVal === false) {
+                            break;
+                        }
+                    }
+                } else if (qq.isArray(iterableItem) || qq.isItemList(iterableItem) || qq.isNodeList(iterableItem)) {
+                    for (keyOrIndex = 0; keyOrIndex < iterableItem.length; keyOrIndex++) {
+                        retVal = callback(keyOrIndex, iterableItem[keyOrIndex]);
+                        if (retVal === false) {
+                            break;
+                        }
+                    }
+                } else if (qq.isString(iterableItem)) {
+                    for (keyOrIndex = 0; keyOrIndex < iterableItem.length; keyOrIndex++) {
+                        retVal = callback(keyOrIndex, iterableItem.charAt(keyOrIndex));
+                        if (retVal === false) {
+                            break;
+                        }
+                    }
+                } else {
+                    for (keyOrIndex in iterableItem) {
+                        if (Object.prototype.hasOwnProperty.call(iterableItem, keyOrIndex)) {
+                            retVal = callback(keyOrIndex, iterableItem[keyOrIndex]);
+                            if (retVal === false) {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        qq.bind = function(oldFunc, context) {
+            if (qq.isFunction(oldFunc)) {
+                var args = Array.prototype.slice.call(arguments, 2);
+                return function() {
+                    var newArgs = qq.extend([], args);
+                    if (arguments.length) {
+                        newArgs = newArgs.concat(Array.prototype.slice.call(arguments));
+                    }
+                    return oldFunc.apply(context, newArgs);
+                };
+            }
+            throw new Error("first parameter must be a function!");
+        };
+        qq.obj2url = function(obj, temp, prefixDone) {
+            var uristrings = [], prefix = "&", add = function(nextObj, i) {
+                var nextTemp = temp ? /\[\]$/.test(temp) ? temp : temp + "[" + i + "]" : i;
+                if (nextTemp !== "undefined" && i !== "undefined") {
+                    uristrings.push(typeof nextObj === "object" ? qq.obj2url(nextObj, nextTemp, true) : Object.prototype.toString.call(nextObj) === "[object Function]" ? encodeURIComponent(nextTemp) + "=" + encodeURIComponent(nextObj()) : encodeURIComponent(nextTemp) + "=" + encodeURIComponent(nextObj));
+                }
+            };
+            if (!prefixDone && temp) {
+                prefix = /\?/.test(temp) ? /\?$/.test(temp) ? "" : "&" : "?";
+                uristrings.push(temp);
+                uristrings.push(qq.obj2url(obj));
+            } else if (Object.prototype.toString.call(obj) === "[object Array]" && typeof obj !== "undefined") {
+                qq.each(obj, function(idx, val) {
+                    add(val, idx);
+                });
+            } else if (typeof obj !== "undefined" && obj !== null && typeof obj === "object") {
+                qq.each(obj, function(prop, val) {
+                    add(val, prop);
+                });
+            } else {
+                uristrings.push(encodeURIComponent(temp) + "=" + encodeURIComponent(obj));
+            }
+            if (temp) {
+                return uristrings.join(prefix);
+            } else {
+                return uristrings.join(prefix).replace(/^&/, "").replace(/%20/g, "+");
+            }
+        };
+        qq.obj2FormData = function(obj, formData, arrayKeyName) {
+            if (!formData) {
+                formData = new FormData();
+            }
+            qq.each(obj, function(key, val) {
+                key = arrayKeyName ? arrayKeyName + "[" + key + "]" : key;
+                if (qq.isObject(val)) {
+                    qq.obj2FormData(val, formData, key);
+                } else if (qq.isFunction(val)) {
+                    formData.append(key, val());
+                } else {
+                    formData.append(key, val);
+                }
+            });
+            return formData;
+        };
+        qq.obj2Inputs = function(obj, form) {
+            var input;
+            if (!form) {
+                form = document.createElement("form");
+            }
+            qq.obj2FormData(obj, {
+                append: function(key, val) {
+                    input = document.createElement("input");
+                    input.setAttribute("name", key);
+                    input.setAttribute("value", val);
+                    form.appendChild(input);
+                }
+            });
+            return form;
+        };
+        qq.parseJson = function(json) {
+            if (window.JSON && qq.isFunction(JSON.parse)) {
+                return JSON.parse(json);
+            } else {
+                return eval("(" + json + ")");
+            }
+        };
+        qq.getExtension = function(filename) {
+            var extIdx = filename.lastIndexOf(".") + 1;
+            if (extIdx > 0) {
+                return filename.substr(extIdx, filename.length - extIdx);
+            }
+        };
+        qq.getFilename = function(blobOrFileInput) {
+            if (qq.isInput(blobOrFileInput)) {
+                return blobOrFileInput.value.replace(/.*(\/|\\)/, "");
+            } else if (qq.isFile(blobOrFileInput)) {
+                if (blobOrFileInput.fileName !== null && blobOrFileInput.fileName !== undefined) {
+                    return blobOrFileInput.fileName;
+                }
+            }
+            return blobOrFileInput.name;
+        };
+        qq.DisposeSupport = function() {
+            var disposers = [];
+            return {
+                dispose: function() {
+                    var disposer;
+                    do {
+                        disposer = disposers.shift();
+                        if (disposer) {
+                            disposer();
+                        }
+                    } while (disposer);
+                },
+                attach: function() {
+                    var args = arguments;
+                    this.addDisposer(qq(args[0]).attach.apply(this, Array.prototype.slice.call(arguments, 1)));
+                },
+                addDisposer: function(disposeFunction) {
+                    disposers.push(disposeFunction);
+                }
+            };
+        };
+    })();
+    (function() {
+        "use strict";
+        if (typeof define === "function" && define.amd) {
+            define(function() {
+                return qq;
+            });
+        } else if (typeof module !== "undefined" && module.exports) {
+            module.exports = qq;
+        } else {
+            global.qq = qq;
+        }
+    })();
+    (function() {
+        "use strict";
+        qq.Error = function(message) {
+            this.message = "[Fine Uploader " + qq.version + "] " + message;
+        };
+        qq.Error.prototype = new Error();
+    })();
+    qq.version = "5.15.4";
+    qq.supportedFeatures = function() {
+        "use strict";
+        var supportsUploading, supportsUploadingBlobs, supportsFileDrop, supportsAjaxFileUploading, supportsFolderDrop, supportsChunking, supportsResume, supportsUploadViaPaste, supportsUploadCors, supportsDeleteFileXdr, supportsDeleteFileCorsXhr, supportsDeleteFileCors, supportsFolderSelection, supportsImagePreviews, supportsUploadProgress;
+        function testSupportsFileInputElement() {
+            var supported = true, tempInput;
+            try {
+                tempInput = document.createElement("input");
+                tempInput.type = "file";
+                qq(tempInput).hide();
+                if (tempInput.disabled) {
+                    supported = false;
+                }
+            } catch (ex) {
+                supported = false;
+            }
+            return supported;
+        }
+        function isChrome21OrHigher() {
+            return (qq.chrome() || qq.opera()) && navigator.userAgent.match(/Chrome\/[2][1-9]|Chrome\/[3-9][0-9]/) !== undefined;
+        }
+        function isChrome14OrHigher() {
+            return (qq.chrome() || qq.opera()) && navigator.userAgent.match(/Chrome\/[1][4-9]|Chrome\/[2-9][0-9]/) !== undefined;
+        }
+        function isCrossOriginXhrSupported() {
+            if (window.XMLHttpRequest) {
+                var xhr = qq.createXhrInstance();
+                return xhr.withCredentials !== undefined;
+            }
+            return false;
+        }
+        function isXdrSupported() {
+            return window.XDomainRequest !== undefined;
+        }
+        function isCrossOriginAjaxSupported() {
+            if (isCrossOriginXhrSupported()) {
+                return true;
+            }
+            return isXdrSupported();
+        }
+        function isFolderSelectionSupported() {
+            return document.createElement("input").webkitdirectory !== undefined;
+        }
+        function isLocalStorageSupported() {
+            try {
+                return !!window.localStorage && qq.isFunction(window.localStorage.setItem);
+            } catch (error) {
+                return false;
+            }
+        }
+        function isDragAndDropSupported() {
+            var span = document.createElement("span");
+            return ("draggable" in span || "ondragstart" in span && "ondrop" in span) && !qq.android() && !qq.ios();
+        }
+        supportsUploading = testSupportsFileInputElement();
+        supportsAjaxFileUploading = supportsUploading && qq.isXhrUploadSupported();
+        supportsUploadingBlobs = supportsAjaxFileUploading && !qq.androidStock();
+        supportsFileDrop = supportsAjaxFileUploading && isDragAndDropSupported();
+        supportsFolderDrop = supportsFileDrop && isChrome21OrHigher();
+        supportsChunking = supportsAjaxFileUploading && qq.isFileChunkingSupported();
+        supportsResume = supportsAjaxFileUploading && supportsChunking && isLocalStorageSupported();
+        supportsUploadViaPaste = supportsAjaxFileUploading && isChrome14OrHigher();
+        supportsUploadCors = supportsUploading && (window.postMessage !== undefined || supportsAjaxFileUploading);
+        supportsDeleteFileCorsXhr = isCrossOriginXhrSupported();
+        supportsDeleteFileXdr = isXdrSupported();
+        supportsDeleteFileCors = isCrossOriginAjaxSupported();
+        supportsFolderSelection = isFolderSelectionSupported();
+        supportsImagePreviews = supportsAjaxFileUploading && window.FileReader !== undefined;
+        supportsUploadProgress = function() {
+            if (supportsAjaxFileUploading) {
+                return !qq.androidStock() && !qq.iosChrome();
+            }
+            return false;
+        }();
+        return {
+            ajaxUploading: supportsAjaxFileUploading,
+            blobUploading: supportsUploadingBlobs,
+            canDetermineSize: supportsAjaxFileUploading,
+            chunking: supportsChunking,
+            deleteFileCors: supportsDeleteFileCors,
+            deleteFileCorsXdr: supportsDeleteFileXdr,
+            deleteFileCorsXhr: supportsDeleteFileCorsXhr,
+            dialogElement: !!window.HTMLDialogElement,
+            fileDrop: supportsFileDrop,
+            folderDrop: supportsFolderDrop,
+            folderSelection: supportsFolderSelection,
+            imagePreviews: supportsImagePreviews,
+            imageValidation: supportsImagePreviews,
+            itemSizeValidation: supportsAjaxFileUploading,
+            pause: supportsChunking,
+            progressBar: supportsUploadProgress,
+            resume: supportsResume,
+            scaling: supportsImagePreviews && supportsUploadingBlobs,
+            tiffPreviews: qq.safari(),
+            unlimitedScaledImageSize: !qq.ios(),
+            uploading: supportsUploading,
+            uploadCors: supportsUploadCors,
+            uploadCustomHeaders: supportsAjaxFileUploading,
+            uploadNonMultipart: supportsAjaxFileUploading,
+            uploadViaPaste: supportsUploadViaPaste
+        };
+    }();
+    qq.isGenericPromise = function(maybePromise) {
+        "use strict";
+        return !!(maybePromise && maybePromise.then && qq.isFunction(maybePromise.then));
+    };
+    qq.Promise = function() {
+        "use strict";
+        var successArgs, failureArgs, successCallbacks = [], failureCallbacks = [], doneCallbacks = [], state = 0;
+        qq.extend(this, {
+            then: function(onSuccess, onFailure) {
+                if (state === 0) {
+                    if (onSuccess) {
+                        successCallbacks.push(onSuccess);
+                    }
+                    if (onFailure) {
+                        failureCallbacks.push(onFailure);
+                    }
+                } else if (state === -1) {
+                    onFailure && onFailure.apply(null, failureArgs);
+                } else if (onSuccess) {
+                    onSuccess.apply(null, successArgs);
+                }
+                return this;
+            },
+            done: function(callback) {
+                if (state === 0) {
+                    doneCallbacks.push(callback);
+                } else {
+                    callback.apply(null, failureArgs === undefined ? successArgs : failureArgs);
+                }
+                return this;
+            },
+            success: function() {
+                state = 1;
+                successArgs = arguments;
+                if (successCallbacks.length) {
+                    qq.each(successCallbacks, function(idx, callback) {
+                        callback.apply(null, successArgs);
+                    });
+                }
+                if (doneCallbacks.length) {
+                    qq.each(doneCallbacks, function(idx, callback) {
+                        callback.apply(null, successArgs);
+                    });
+                }
+                return this;
+            },
+            failure: function() {
+                state = -1;
+                failureArgs = arguments;
+                if (failureCallbacks.length) {
+                    qq.each(failureCallbacks, function(idx, callback) {
+                        callback.apply(null, failureArgs);
+                    });
+                }
+                if (doneCallbacks.length) {
+                    qq.each(doneCallbacks, function(idx, callback) {
+                        callback.apply(null, failureArgs);
+                    });
+                }
+                return this;
+            }
+        });
+    };
+    qq.BlobProxy = function(referenceBlob, onCreate) {
+        "use strict";
+        qq.extend(this, {
+            referenceBlob: referenceBlob,
+            create: function() {
+                return onCreate(referenceBlob);
+            }
+        });
+    };
+    qq.UploadButton = function(o) {
+        "use strict";
+        var self = this, disposeSupport = new qq.DisposeSupport(), options = {
+            acceptFiles: null,
+            element: null,
+            focusClass: "qq-upload-button-focus",
+            folders: false,
+            hoverClass: "qq-upload-button-hover",
+            ios8BrowserCrashWorkaround: false,
+            multiple: false,
+            name: "qqfile",
+            onChange: function(input) {},
+            title: null
+        }, input, buttonId;
+        qq.extend(options, o);
+        buttonId = qq.getUniqueId();
+        function createInput() {
+            var input = document.createElement("input");
+            input.setAttribute(qq.UploadButton.BUTTON_ID_ATTR_NAME, buttonId);
+            input.setAttribute("title", options.title);
+            self.setMultiple(options.multiple, input);
+            if (options.folders && qq.supportedFeatures.folderSelection) {
+                input.setAttribute("webkitdirectory", "");
+            }
+            if (options.acceptFiles) {
+                input.setAttribute("accept", options.acceptFiles);
+            }
+            input.setAttribute("type", "file");
+            input.setAttribute("name", options.name);
+            qq(input).css({
+                position: "absolute",
+                right: 0,
+                top: 0,
+                fontFamily: "Arial",
+                fontSize: qq.ie() && !qq.ie8() ? "3500px" : "118px",
+                margin: 0,
+                padding: 0,
+                cursor: "pointer",
+                opacity: 0
+            });
+            !qq.ie7() && qq(input).css({
+                height: "100%"
+            });
+            options.element.appendChild(input);
+            disposeSupport.attach(input, "change", function() {
+                options.onChange(input);
+            });
+            disposeSupport.attach(input, "mouseover", function() {
+                qq(options.element).addClass(options.hoverClass);
+            });
+            disposeSupport.attach(input, "mouseout", function() {
+                qq(options.element).removeClass(options.hoverClass);
+            });
+            disposeSupport.attach(input, "focus", function() {
+                qq(options.element).addClass(options.focusClass);
+            });
+            disposeSupport.attach(input, "blur", function() {
+                qq(options.element).removeClass(options.focusClass);
+            });
+            return input;
+        }
+        qq(options.element).css({
+            position: "relative",
+            overflow: "hidden",
+            direction: "ltr"
+        });
+        qq.extend(this, {
+            getInput: function() {
+                return input;
+            },
+            getButtonId: function() {
+                return buttonId;
+            },
+            setMultiple: function(isMultiple, optInput) {
+                var input = optInput || this.getInput();
+                if (options.ios8BrowserCrashWorkaround && qq.ios8() && (qq.iosChrome() || qq.iosSafariWebView())) {
+                    input.setAttribute("multiple", "");
+                } else {
+                    if (isMultiple) {
+                        input.setAttribute("multiple", "");
+                    } else {
+                        input.removeAttribute("multiple");
+                    }
+                }
+            },
+            setAcceptFiles: function(acceptFiles) {
+                if (acceptFiles !== options.acceptFiles) {
+                    input.setAttribute("accept", acceptFiles);
+                }
+            },
+            reset: function() {
+                if (input.parentNode) {
+                    qq(input).remove();
+                }
+                qq(options.element).removeClass(options.focusClass);
+                input = null;
+                input = createInput();
+            }
+        });
+        input = createInput();
+    };
+    qq.UploadButton.BUTTON_ID_ATTR_NAME = "qq-button-id";
+    qq.UploadData = function(uploaderProxy) {
+        "use strict";
+        var data = [], byUuid = {}, byStatus = {}, byProxyGroupId = {}, byBatchId = {};
+        function getDataByIds(idOrIds) {
+            if (qq.isArray(idOrIds)) {
+                var entries = [];
+                qq.each(idOrIds, function(idx, id) {
+                    entries.push(data[id]);
+                });
+                return entries;
+            }
+            return data[idOrIds];
+        }
+        function getDataByUuids(uuids) {
+            if (qq.isArray(uuids)) {
+                var entries = [];
+                qq.each(uuids, function(idx, uuid) {
+                    entries.push(data[byUuid[uuid]]);
+                });
+                return entries;
+            }
+            return data[byUuid[uuids]];
+        }
+        function getDataByStatus(status) {
+            var statusResults = [], statuses = [].concat(status);
+            qq.each(statuses, function(index, statusEnum) {
+                var statusResultIndexes = byStatus[statusEnum];
+                if (statusResultIndexes !== undefined) {
+                    qq.each(statusResultIndexes, function(i, dataIndex) {
+                        statusResults.push(data[dataIndex]);
+                    });
+                }
+            });
+            return statusResults;
+        }
+        qq.extend(this, {
+            addFile: function(spec) {
+                var status = spec.status || qq.status.SUBMITTING, id = data.push({
+                    name: spec.name,
+                    originalName: spec.name,
+                    uuid: spec.uuid,
+                    size: spec.size == null ? -1 : spec.size,
+                    status: status
+                }) - 1;
+                if (spec.batchId) {
+                    data[id].batchId = spec.batchId;
+                    if (byBatchId[spec.batchId] === undefined) {
+                        byBatchId[spec.batchId] = [];
+                    }
+                    byBatchId[spec.batchId].push(id);
+                }
+                if (spec.proxyGroupId) {
+                    data[id].proxyGroupId = spec.proxyGroupId;
+                    if (byProxyGroupId[spec.proxyGroupId] === undefined) {
+                        byProxyGroupId[spec.proxyGroupId] = [];
+                    }
+                    byProxyGroupId[spec.proxyGroupId].push(id);
+                }
+                data[id].id = id;
+                byUuid[spec.uuid] = id;
+                if (byStatus[status] === undefined) {
+                    byStatus[status] = [];
+                }
+                byStatus[status].push(id);
+                spec.onBeforeStatusChange && spec.onBeforeStatusChange(id);
+                uploaderProxy.onStatusChange(id, null, status);
+                return id;
+            },
+            retrieve: function(optionalFilter) {
+                if (qq.isObject(optionalFilter) && data.length) {
+                    if (optionalFilter.id !== undefined) {
+                        return getDataByIds(optionalFilter.id);
+                    } else if (optionalFilter.uuid !== undefined) {
+                        return getDataByUuids(optionalFilter.uuid);
+                    } else if (optionalFilter.status) {
+                        return getDataByStatus(optionalFilter.status);
+                    }
+                } else {
+                    return qq.extend([], data, true);
+                }
+            },
+            reset: function() {
+                data = [];
+                byUuid = {};
+                byStatus = {};
+                byBatchId = {};
+            },
+            setStatus: function(id, newStatus) {
+                var oldStatus = data[id].status, byStatusOldStatusIndex = qq.indexOf(byStatus[oldStatus], id);
+                byStatus[oldStatus].splice(byStatusOldStatusIndex, 1);
+                data[id].status = newStatus;
+                if (byStatus[newStatus] === undefined) {
+                    byStatus[newStatus] = [];
+                }
+                byStatus[newStatus].push(id);
+                uploaderProxy.onStatusChange(id, oldStatus, newStatus);
+            },
+            uuidChanged: function(id, newUuid) {
+                var oldUuid = data[id].uuid;
+                data[id].uuid = newUuid;
+                byUuid[newUuid] = id;
+                delete byUuid[oldUuid];
+            },
+            updateName: function(id, newName) {
+                data[id].name = newName;
+            },
+            updateSize: function(id, newSize) {
+                data[id].size = newSize;
+            },
+            setParentId: function(targetId, parentId) {
+                data[targetId].parentId = parentId;
+            },
+            getIdsInProxyGroup: function(id) {
+                var proxyGroupId = data[id].proxyGroupId;
+                if (proxyGroupId) {
+                    return byProxyGroupId[proxyGroupId];
+                }
+                return [];
+            },
+            getIdsInBatch: function(id) {
+                var batchId = data[id].batchId;
+                return byBatchId[batchId];
+            }
+        });
+    };
+    qq.status = {
+        SUBMITTING: "submitting",
+        SUBMITTED: "submitted",
+        REJECTED: "rejected",
+        QUEUED: "queued",
+        CANCELED: "canceled",
+        PAUSED: "paused",
+        UPLOADING: "uploading",
+        UPLOAD_RETRYING: "retrying upload",
+        UPLOAD_SUCCESSFUL: "upload successful",
+        UPLOAD_FAILED: "upload failed",
+        DELETE_FAILED: "delete failed",
+        DELETING: "deleting",
+        DELETED: "deleted"
+    };
+    (function() {
+        "use strict";
+        qq.basePublicApi = {
+            addBlobs: function(blobDataOrArray, params, endpoint) {
+                this.addFiles(blobDataOrArray, params, endpoint);
+            },
+            addInitialFiles: function(cannedFileList) {
+                var self = this;
+                qq.each(cannedFileList, function(index, cannedFile) {
+                    self._addCannedFile(cannedFile);
+                });
+            },
+            addFiles: function(data, params, endpoint) {
+                this._maybeHandleIos8SafariWorkaround();
+                var batchId = this._storedIds.length === 0 ? qq.getUniqueId() : this._currentBatchId, processBlob = qq.bind(function(blob) {
+                    this._handleNewFile({
+                        blob: blob,
+                        name: this._options.blobs.defaultName
+                    }, batchId, verifiedFiles);
+                }, this), processBlobData = qq.bind(function(blobData) {
+                    this._handleNewFile(blobData, batchId, verifiedFiles);
+                }, this), processCanvas = qq.bind(function(canvas) {
+                    var blob = qq.canvasToBlob(canvas);
+                    this._handleNewFile({
+                        blob: blob,
+                        name: this._options.blobs.defaultName + ".png"
+                    }, batchId, verifiedFiles);
+                }, this), processCanvasData = qq.bind(function(canvasData) {
+                    var normalizedQuality = canvasData.quality && canvasData.quality / 100, blob = qq.canvasToBlob(canvasData.canvas, canvasData.type, normalizedQuality);
+                    this._handleNewFile({
+                        blob: blob,
+                        name: canvasData.name
+                    }, batchId, verifiedFiles);
+                }, this), processFileOrInput = qq.bind(function(fileOrInput) {
+                    if (qq.isInput(fileOrInput) && qq.supportedFeatures.ajaxUploading) {
+                        var files = Array.prototype.slice.call(fileOrInput.files), self = this;
+                        qq.each(files, function(idx, file) {
+                            self._handleNewFile(file, batchId, verifiedFiles);
+                        });
+                    } else {
+                        this._handleNewFile(fileOrInput, batchId, verifiedFiles);
+                    }
+                }, this), normalizeData = function() {
+                    if (qq.isFileList(data)) {
+                        data = Array.prototype.slice.call(data);
+                    }
+                    data = [].concat(data);
+                }, self = this, verifiedFiles = [];
+                this._currentBatchId = batchId;
+                if (data) {
+                    normalizeData();
+                    qq.each(data, function(idx, fileContainer) {
+                        if (qq.isFileOrInput(fileContainer)) {
+                            processFileOrInput(fileContainer);
+                        } else if (qq.isBlob(fileContainer)) {
+                            processBlob(fileContainer);
+                        } else if (qq.isObject(fileContainer)) {
+                            if (fileContainer.blob && fileContainer.name) {
+                                processBlobData(fileContainer);
+                            } else if (fileContainer.canvas && fileContainer.name) {
+                                processCanvasData(fileContainer);
+                            }
+                        } else if (fileContainer.tagName && fileContainer.tagName.toLowerCase() === "canvas") {
+                            processCanvas(fileContainer);
+                        } else {
+                            self.log(fileContainer + " is not a valid file container!  Ignoring!", "warn");
+                        }
+                    });
+                    this.log("Received " + verifiedFiles.length + " files.");
+                    this._prepareItemsForUpload(verifiedFiles, params, endpoint);
+                }
+            },
+            cancel: function(id) {
+                this._handler.cancel(id);
+            },
+            cancelAll: function() {
+                var storedIdsCopy = [], self = this;
+                qq.extend(storedIdsCopy, this._storedIds);
+                qq.each(storedIdsCopy, function(idx, storedFileId) {
+                    self.cancel(storedFileId);
+                });
+                this._handler.cancelAll();
+            },
+            clearStoredFiles: function() {
+                this._storedIds = [];
+            },
+            continueUpload: function(id) {
+                var uploadData = this._uploadData.retrieve({
+                    id: id
+                });
+                if (!qq.supportedFeatures.pause || !this._options.chunking.enabled) {
+                    return false;
+                }
+                if (uploadData.status === qq.status.PAUSED) {
+                    this.log(qq.format("Paused file ID {} ({}) will be continued.  Not paused.", id, this.getName(id)));
+                    this._uploadFile(id);
+                    return true;
+                } else {
+                    this.log(qq.format("Ignoring continue for file ID {} ({}).  Not paused.", id, this.getName(id)), "error");
+                }
+                return false;
+            },
+            deleteFile: function(id) {
+                return this._onSubmitDelete(id);
+            },
+            doesExist: function(fileOrBlobId) {
+                return this._handler.isValid(fileOrBlobId);
+            },
+            drawThumbnail: function(fileId, imgOrCanvas, maxSize, fromServer, customResizeFunction) {
+                var promiseToReturn = new qq.Promise(), fileOrUrl, options;
+                if (this._imageGenerator) {
+                    fileOrUrl = this._thumbnailUrls[fileId];
+                    options = {
+                        customResizeFunction: customResizeFunction,
+                        maxSize: maxSize > 0 ? maxSize : null,
+                        scale: maxSize > 0
+                    };
+                    if (!fromServer && qq.supportedFeatures.imagePreviews) {
+                        fileOrUrl = this.getFile(fileId);
+                    }
+                    if (fileOrUrl == null) {
+                        promiseToReturn.failure({
+                            container: imgOrCanvas,
+                            error: "File or URL not found."
+                        });
+                    } else {
+                        this._imageGenerator.generate(fileOrUrl, imgOrCanvas, options).then(function success(modifiedContainer) {
+                            promiseToReturn.success(modifiedContainer);
+                        }, function failure(container, reason) {
+                            promiseToReturn.failure({
+                                container: container,
+                                error: reason || "Problem generating thumbnail"
+                            });
+                        });
+                    }
+                } else {
+                    promiseToReturn.failure({
+                        container: imgOrCanvas,
+                        error: "Missing image generator module"
+                    });
+                }
+                return promiseToReturn;
+            },
+            getButton: function(fileId) {
+                return this._getButton(this._buttonIdsForFileIds[fileId]);
+            },
+            getEndpoint: function(fileId) {
+                return this._endpointStore.get(fileId);
+            },
+            getFile: function(fileOrBlobId) {
+                return this._handler.getFile(fileOrBlobId) || null;
+            },
+            getInProgress: function() {
+                return this._uploadData.retrieve({
+                    status: [ qq.status.UPLOADING, qq.status.UPLOAD_RETRYING, qq.status.QUEUED ]
+                }).length;
+            },
+            getName: function(id) {
+                return this._uploadData.retrieve({
+                    id: id
+                }).name;
+            },
+            getParentId: function(id) {
+                var uploadDataEntry = this.getUploads({
+                    id: id
+                }), parentId = null;
+                if (uploadDataEntry) {
+                    if (uploadDataEntry.parentId !== undefined) {
+                        parentId = uploadDataEntry.parentId;
+                    }
+                }
+                return parentId;
+            },
+            getResumableFilesData: function() {
+                return this._handler.getResumableFilesData();
+            },
+            getSize: function(id) {
+                return this._uploadData.retrieve({
+                    id: id
+                }).size;
+            },
+            getNetUploads: function() {
+                return this._netUploaded;
+            },
+            getRemainingAllowedItems: function() {
+                var allowedItems = this._currentItemLimit;
+                if (allowedItems > 0) {
+                    return allowedItems - this._netUploadedOrQueued;
+                }
+                return null;
+            },
+            getUploads: function(optionalFilter) {
+                return this._uploadData.retrieve(optionalFilter);
+            },
+            getUuid: function(id) {
+                return this._uploadData.retrieve({
+                    id: id
+                }).uuid;
+            },
+            log: function(str, level) {
+                if (this._options.debug && (!level || level === "info")) {
+                    qq.log("[Fine Uploader " + qq.version + "] " + str);
+                } else if (level && level !== "info") {
+                    qq.log("[Fine Uploader " + qq.version + "] " + str, level);
+                }
+            },
+            pauseUpload: function(id) {
+                var uploadData = this._uploadData.retrieve({
+                    id: id
+                });
+                if (!qq.supportedFeatures.pause || !this._options.chunking.enabled) {
+                    return false;
+                }
+                if (qq.indexOf([ qq.status.UPLOADING, qq.status.UPLOAD_RETRYING ], uploadData.status) >= 0) {
+                    if (this._handler.pause(id)) {
+                        this._uploadData.setStatus(id, qq.status.PAUSED);
+                        return true;
+                    } else {
+                        this.log(qq.format("Unable to pause file ID {} ({}).", id, this.getName(id)), "error");
+                    }
+                } else {
+                    this.log(qq.format("Ignoring pause for file ID {} ({}).  Not in progress.", id, this.getName(id)), "error");
+                }
+                return false;
+            },
+            removeFileRef: function(id) {
+                this._handler.expunge(id);
+            },
+            reset: function() {
+                this.log("Resetting uploader...");
+                this._handler.reset();
+                this._storedIds = [];
+                this._autoRetries = [];
+                this._retryTimeouts = [];
+                this._preventRetries = [];
+                this._thumbnailUrls = [];
+                qq.each(this._buttons, function(idx, button) {
+                    button.reset();
+                });
+                this._paramsStore.reset();
+                this._endpointStore.reset();
+                this._netUploadedOrQueued = 0;
+                this._netUploaded = 0;
+                this._uploadData.reset();
+                this._buttonIdsForFileIds = [];
+                this._pasteHandler && this._pasteHandler.reset();
+                this._options.session.refreshOnReset && this._refreshSessionData();
+                this._succeededSinceLastAllComplete = [];
+                this._failedSinceLastAllComplete = [];
+                this._totalProgress && this._totalProgress.reset();
+            },
+            retry: function(id) {
+                return this._manualRetry(id);
+            },
+            scaleImage: function(id, specs) {
+                var self = this;
+                return qq.Scaler.prototype.scaleImage(id, specs, {
+                    log: qq.bind(self.log, self),
+                    getFile: qq.bind(self.getFile, self),
+                    uploadData: self._uploadData
+                });
+            },
+            setCustomHeaders: function(headers, id) {
+                this._customHeadersStore.set(headers, id);
+            },
+            setDeleteFileCustomHeaders: function(headers, id) {
+                this._deleteFileCustomHeadersStore.set(headers, id);
+            },
+            setDeleteFileEndpoint: function(endpoint, id) {
+                this._deleteFileEndpointStore.set(endpoint, id);
+            },
+            setDeleteFileParams: function(params, id) {
+                this._deleteFileParamsStore.set(params, id);
+            },
+            setEndpoint: function(endpoint, id) {
+                this._endpointStore.set(endpoint, id);
+            },
+            setForm: function(elementOrId) {
+                this._updateFormSupportAndParams(elementOrId);
+            },
+            setItemLimit: function(newItemLimit) {
+                this._currentItemLimit = newItemLimit;
+            },
+            setName: function(id, newName) {
+                this._uploadData.updateName(id, newName);
+            },
+            setParams: function(params, id) {
+                this._paramsStore.set(params, id);
+            },
+            setUuid: function(id, newUuid) {
+                return this._uploadData.uuidChanged(id, newUuid);
+            },
+            setStatus: function(id, newStatus) {
+                var fileRecord = this.getUploads({
+                    id: id
+                });
+                if (!fileRecord) {
+                    throw new qq.Error(id + " is not a valid file ID.");
+                }
+                switch (newStatus) {
+                  case qq.status.DELETED:
+                    this._onDeleteComplete(id, null, false);
+                    break;
+
+                  case qq.status.DELETE_FAILED:
+                    this._onDeleteComplete(id, null, true);
+                    break;
+
+                  default:
+                    var errorMessage = "Method setStatus called on '" + name + "' not implemented yet for " + newStatus;
+                    this.log(errorMessage);
+                    throw new qq.Error(errorMessage);
+                }
+            },
+            uploadStoredFiles: function() {
+                if (this._storedIds.length === 0) {
+                    this._itemError("noFilesError");
+                } else {
+                    this._uploadStoredFiles();
+                }
+            }
+        };
+        qq.basePrivateApi = {
+            _addCannedFile: function(sessionData) {
+                var self = this;
+                return this._uploadData.addFile({
+                    uuid: sessionData.uuid,
+                    name: sessionData.name,
+                    size: sessionData.size,
+                    status: qq.status.UPLOAD_SUCCESSFUL,
+                    onBeforeStatusChange: function(id) {
+                        sessionData.deleteFileEndpoint && self.setDeleteFileEndpoint(sessionData.deleteFileEndpoint, id);
+                        sessionData.deleteFileParams && self.setDeleteFileParams(sessionData.deleteFileParams, id);
+                        if (sessionData.thumbnailUrl) {
+                            self._thumbnailUrls[id] = sessionData.thumbnailUrl;
+                        }
+                        self._netUploaded++;
+                        self._netUploadedOrQueued++;
+                    }
+                });
+            },
+            _annotateWithButtonId: function(file, associatedInput) {
+                if (qq.isFile(file)) {
+                    file.qqButtonId = this._getButtonId(associatedInput);
+                }
+            },
+            _batchError: function(message) {
+                this._options.callbacks.onError(null, null, message, undefined);
+            },
+            _createDeleteHandler: function() {
+                var self = this;
+                return new qq.DeleteFileAjaxRequester({
+                    method: this._options.deleteFile.method.toUpperCase(),
+                    maxConnections: this._options.maxConnections,
+                    uuidParamName: this._options.request.uuidName,
+                    customHeaders: this._deleteFileCustomHeadersStore,
+                    paramsStore: this._deleteFileParamsStore,
+                    endpointStore: this._deleteFileEndpointStore,
+                    cors: this._options.cors,
+                    log: qq.bind(self.log, self),
+                    onDelete: function(id) {
+                        self._onDelete(id);
+                        self._options.callbacks.onDelete(id);
+                    },
+                    onDeleteComplete: function(id, xhrOrXdr, isError) {
+                        self._onDeleteComplete(id, xhrOrXdr, isError);
+                        self._options.callbacks.onDeleteComplete(id, xhrOrXdr, isError);
+                    }
+                });
+            },
+            _createPasteHandler: function() {
+                var self = this;
+                return new qq.PasteSupport({
+                    targetElement: this._options.paste.targetElement,
+                    callbacks: {
+                        log: qq.bind(self.log, self),
+                        pasteReceived: function(blob) {
+                            self._handleCheckedCallback({
+                                name: "onPasteReceived",
+                                callback: qq.bind(self._options.callbacks.onPasteReceived, self, blob),
+                                onSuccess: qq.bind(self._handlePasteSuccess, self, blob),
+                                identifier: "pasted image"
+                            });
+                        }
+                    }
+                });
+            },
+            _createStore: function(initialValue, _readOnlyValues_) {
+                var store = {}, catchall = initialValue, perIdReadOnlyValues = {}, readOnlyValues = _readOnlyValues_, copy = function(orig) {
+                    if (qq.isObject(orig)) {
+                        return qq.extend({}, orig);
+                    }
+                    return orig;
+                }, getReadOnlyValues = function() {
+                    if (qq.isFunction(readOnlyValues)) {
+                        return readOnlyValues();
+                    }
+                    return readOnlyValues;
+                }, includeReadOnlyValues = function(id, existing) {
+                    if (readOnlyValues && qq.isObject(existing)) {
+                        qq.extend(existing, getReadOnlyValues());
+                    }
+                    if (perIdReadOnlyValues[id]) {
+                        qq.extend(existing, perIdReadOnlyValues[id]);
+                    }
+                };
+                return {
+                    set: function(val, id) {
+                        if (id == null) {
+                            store = {};
+                            catchall = copy(val);
+                        } else {
+                            store[id] = copy(val);
+                        }
+                    },
+                    get: function(id) {
+                        var values;
+                        if (id != null && store[id]) {
+                            values = store[id];
+                        } else {
+                            values = copy(catchall);
+                        }
+                        includeReadOnlyValues(id, values);
+                        return copy(values);
+                    },
+                    addReadOnly: function(id, values) {
+                        if (qq.isObject(store)) {
+                            if (id === null) {
+                                if (qq.isFunction(values)) {
+                                    readOnlyValues = values;
+                                } else {
+                                    readOnlyValues = readOnlyValues || {};
+                                    qq.extend(readOnlyValues, values);
+                                }
+                            } else {
+                                perIdReadOnlyValues[id] = perIdReadOnlyValues[id] || {};
+                                qq.extend(perIdReadOnlyValues[id], values);
+                            }
+                        }
+                    },
+                    remove: function(fileId) {
+                        return delete store[fileId];
+                    },
+                    reset: function() {
+                        store = {};
+                        perIdReadOnlyValues = {};
+                        catchall = initialValue;
+                    }
+                };
+            },
+            _createUploadDataTracker: function() {
+                var self = this;
+                return new qq.UploadData({
+                    getName: function(id) {
+                        return self.getName(id);
+                    },
+                    getUuid: function(id) {
+                        return self.getUuid(id);
+                    },
+                    getSize: function(id) {
+                        return self.getSize(id);
+                    },
+                    onStatusChange: function(id, oldStatus, newStatus) {
+                        self._onUploadStatusChange(id, oldStatus, newStatus);
+                        self._options.callbacks.onStatusChange(id, oldStatus, newStatus);
+                        self._maybeAllComplete(id, newStatus);
+                        if (self._totalProgress) {
+                            setTimeout(function() {
+                                self._totalProgress.onStatusChange(id, oldStatus, newStatus);
+                            }, 0);
+                        }
+                    }
+                });
+            },
+            _createUploadButton: function(spec) {
+                var self = this, acceptFiles = spec.accept || this._options.validation.acceptFiles, allowedExtensions = spec.allowedExtensions || this._options.validation.allowedExtensions, button;
+                function allowMultiple() {
+                    if (qq.supportedFeatures.ajaxUploading) {
+                        if (self._options.workarounds.iosEmptyVideos && qq.ios() && !qq.ios6() && self._isAllowedExtension(allowedExtensions, ".mov")) {
+                            return false;
+                        }
+                        if (spec.multiple === undefined) {
+                            return self._options.multiple;
+                        }
+                        return spec.multiple;
+                    }
+                    return false;
+                }
+                button = new qq.UploadButton({
+                    acceptFiles: acceptFiles,
+                    element: spec.element,
+                    focusClass: this._options.classes.buttonFocus,
+                    folders: spec.folders,
+                    hoverClass: this._options.classes.buttonHover,
+                    ios8BrowserCrashWorkaround: this._options.workarounds.ios8BrowserCrash,
+                    multiple: allowMultiple(),
+                    name: this._options.request.inputName,
+                    onChange: function(input) {
+                        self._onInputChange(input);
+                    },
+                    title: spec.title == null ? this._options.text.fileInputTitle : spec.title
+                });
+                this._disposeSupport.addDisposer(function() {
+                    button.dispose();
+                });
+                self._buttons.push(button);
+                return button;
+            },
+            _createUploadHandler: function(additionalOptions, namespace) {
+                var self = this, lastOnProgress = {}, options = {
+                    debug: this._options.debug,
+                    maxConnections: this._options.maxConnections,
+                    cors: this._options.cors,
+                    paramsStore: this._paramsStore,
+                    endpointStore: this._endpointStore,
+                    chunking: this._options.chunking,
+                    resume: this._options.resume,
+                    blobs: this._options.blobs,
+                    log: qq.bind(self.log, self),
+                    preventRetryParam: this._options.retry.preventRetryResponseProperty,
+                    onProgress: function(id, name, loaded, total) {
+                        if (loaded < 0 || total < 0) {
+                            return;
+                        }
+                        if (lastOnProgress[id]) {
+                            if (lastOnProgress[id].loaded !== loaded || lastOnProgress[id].total !== total) {
+                                self._onProgress(id, name, loaded, total);
+                                self._options.callbacks.onProgress(id, name, loaded, total);
+                            }
+                        } else {
+                            self._onProgress(id, name, loaded, total);
+                            self._options.callbacks.onProgress(id, name, loaded, total);
+                        }
+                        lastOnProgress[id] = {
+                            loaded: loaded,
+                            total: total
+                        };
+                    },
+                    onComplete: function(id, name, result, xhr) {
+                        delete lastOnProgress[id];
+                        var status = self.getUploads({
+                            id: id
+                        }).status, retVal;
+                        if (status === qq.status.UPLOAD_SUCCESSFUL || status === qq.status.UPLOAD_FAILED) {
+                            return;
+                        }
+                        retVal = self._onComplete(id, name, result, xhr);
+                        if (retVal instanceof qq.Promise) {
+                            retVal.done(function() {
+                                self._options.callbacks.onComplete(id, name, result, xhr);
+                            });
+                        } else {
+                            self._options.callbacks.onComplete(id, name, result, xhr);
+                        }
+                    },
+                    onCancel: function(id, name, cancelFinalizationEffort) {
+                        var promise = new qq.Promise();
+                        self._handleCheckedCallback({
+                            name: "onCancel",
+                            callback: qq.bind(self._options.callbacks.onCancel, self, id, name),
+                            onFailure: promise.failure,
+                            onSuccess: function() {
+                                cancelFinalizationEffort.then(function() {
+                                    self._onCancel(id, name);
+                                });
+                                promise.success();
+                            },
+                            identifier: id
+                        });
+                        return promise;
+                    },
+                    onUploadPrep: qq.bind(this._onUploadPrep, this),
+                    onUpload: function(id, name) {
+                        self._onUpload(id, name);
+                        self._options.callbacks.onUpload(id, name);
+                    },
+                    onUploadChunk: function(id, name, chunkData) {
+                        self._onUploadChunk(id, chunkData);
+                        self._options.callbacks.onUploadChunk(id, name, chunkData);
+                    },
+                    onUploadChunkSuccess: function(id, chunkData, result, xhr) {
+                        self._options.callbacks.onUploadChunkSuccess.apply(self, arguments);
+                    },
+                    onResume: function(id, name, chunkData) {
+                        return self._options.callbacks.onResume(id, name, chunkData);
+                    },
+                    onAutoRetry: function(id, name, responseJSON, xhr) {
+                        return self._onAutoRetry.apply(self, arguments);
+                    },
+                    onUuidChanged: function(id, newUuid) {
+                        self.log("Server requested UUID change from '" + self.getUuid(id) + "' to '" + newUuid + "'");
+                        self.setUuid(id, newUuid);
+                    },
+                    getName: qq.bind(self.getName, self),
+                    getUuid: qq.bind(self.getUuid, self),
+                    getSize: qq.bind(self.getSize, self),
+                    setSize: qq.bind(self._setSize, self),
+                    getDataByUuid: function(uuid) {
+                        return self.getUploads({
+                            uuid: uuid
+                        });
+                    },
+                    isQueued: function(id) {
+                        var status = self.getUploads({
+                            id: id
+                        }).status;
+                        return status === qq.status.QUEUED || status === qq.status.SUBMITTED || status === qq.status.UPLOAD_RETRYING || status === qq.status.PAUSED;
+                    },
+                    getIdsInProxyGroup: self._uploadData.getIdsInProxyGroup,
+                    getIdsInBatch: self._uploadData.getIdsInBatch
+                };
+                qq.each(this._options.request, function(prop, val) {
+                    options[prop] = val;
+                });
+                options.customHeaders = this._customHeadersStore;
+                if (additionalOptions) {
+                    qq.each(additionalOptions, function(key, val) {
+                        options[key] = val;
+                    });
+                }
+                return new qq.UploadHandlerController(options, namespace);
+            },
+            _fileOrBlobRejected: function(id) {
+                this._netUploadedOrQueued--;
+                this._uploadData.setStatus(id, qq.status.REJECTED);
+            },
+            _formatSize: function(bytes) {
+                if (bytes === 0) {
+                    return bytes + this._options.text.sizeSymbols[0];
+                }
+                var i = -1;
+                do {
+                    bytes = bytes / 1e3;
+                    i++;
+                } while (bytes > 999);
+                return Math.max(bytes, .1).toFixed(1) + this._options.text.sizeSymbols[i];
+            },
+            _generateExtraButtonSpecs: function() {
+                var self = this;
+                this._extraButtonSpecs = {};
+                qq.each(this._options.extraButtons, function(idx, extraButtonOptionEntry) {
+                    var multiple = extraButtonOptionEntry.multiple, validation = qq.extend({}, self._options.validation, true), extraButtonSpec = qq.extend({}, extraButtonOptionEntry);
+                    if (multiple === undefined) {
+                        multiple = self._options.multiple;
+                    }
+                    if (extraButtonSpec.validation) {
+                        qq.extend(validation, extraButtonOptionEntry.validation, true);
+                    }
+                    qq.extend(extraButtonSpec, {
+                        multiple: multiple,
+                        validation: validation
+                    }, true);
+                    self._initExtraButton(extraButtonSpec);
+                });
+            },
+            _getButton: function(buttonId) {
+                var extraButtonsSpec = this._extraButtonSpecs[buttonId];
+                if (extraButtonsSpec) {
+                    return extraButtonsSpec.element;
+                } else if (buttonId === this._defaultButtonId) {
+                    return this._options.button;
+                }
+            },
+            _getButtonId: function(buttonOrFileInputOrFile) {
+                var inputs, fileInput, fileBlobOrInput = buttonOrFileInputOrFile;
+                if (fileBlobOrInput instanceof qq.BlobProxy) {
+                    fileBlobOrInput = fileBlobOrInput.referenceBlob;
+                }
+                if (fileBlobOrInput && !qq.isBlob(fileBlobOrInput)) {
+                    if (qq.isFile(fileBlobOrInput)) {
+                        return fileBlobOrInput.qqButtonId;
+                    } else if (fileBlobOrInput.tagName.toLowerCase() === "input" && fileBlobOrInput.type.toLowerCase() === "file") {
+                        return fileBlobOrInput.getAttribute(qq.UploadButton.BUTTON_ID_ATTR_NAME);
+                    }
+                    inputs = fileBlobOrInput.getElementsByTagName("input");
+                    qq.each(inputs, function(idx, input) {
+                        if (input.getAttribute("type") === "file") {
+                            fileInput = input;
+                            return false;
+                        }
+                    });
+                    if (fileInput) {
+                        return fileInput.getAttribute(qq.UploadButton.BUTTON_ID_ATTR_NAME);
+                    }
+                }
+            },
+            _getNotFinished: function() {
+                return this._uploadData.retrieve({
+                    status: [ qq.status.UPLOADING, qq.status.UPLOAD_RETRYING, qq.status.QUEUED, qq.status.SUBMITTING, qq.status.SUBMITTED, qq.status.PAUSED ]
+                }).length;
+            },
+            _getValidationBase: function(buttonId) {
+                var extraButtonSpec = this._extraButtonSpecs[buttonId];
+                return extraButtonSpec ? extraButtonSpec.validation : this._options.validation;
+            },
+            _getValidationDescriptor: function(fileWrapper) {
+                if (fileWrapper.file instanceof qq.BlobProxy) {
+                    return {
+                        name: qq.getFilename(fileWrapper.file.referenceBlob),
+                        size: fileWrapper.file.referenceBlob.size
+                    };
+                }
+                return {
+                    name: this.getUploads({
+                        id: fileWrapper.id
+                    }).name,
+                    size: this.getUploads({
+                        id: fileWrapper.id
+                    }).size
+                };
+            },
+            _getValidationDescriptors: function(fileWrappers) {
+                var self = this, fileDescriptors = [];
+                qq.each(fileWrappers, function(idx, fileWrapper) {
+                    fileDescriptors.push(self._getValidationDescriptor(fileWrapper));
+                });
+                return fileDescriptors;
+            },
+            _handleCameraAccess: function() {
+                if (this._options.camera.ios && qq.ios()) {
+                    var acceptIosCamera = "image/*;capture=camera", button = this._options.camera.button, buttonId = button ? this._getButtonId(button) : this._defaultButtonId, optionRoot = this._options;
+                    if (buttonId && buttonId !== this._defaultButtonId) {
+                        optionRoot = this._extraButtonSpecs[buttonId];
+                    }
+                    optionRoot.multiple = false;
+                    if (optionRoot.validation.acceptFiles === null) {
+                        optionRoot.validation.acceptFiles = acceptIosCamera;
+                    } else {
+                        optionRoot.validation.acceptFiles += "," + acceptIosCamera;
+                    }
+                    qq.each(this._buttons, function(idx, button) {
+                        if (button.getButtonId() === buttonId) {
+                            button.setMultiple(optionRoot.multiple);
+                            button.setAcceptFiles(optionRoot.acceptFiles);
+                            return false;
+                        }
+                    });
+                }
+            },
+            _handleCheckedCallback: function(details) {
+                var self = this, callbackRetVal = details.callback();
+                if (qq.isGenericPromise(callbackRetVal)) {
+                    this.log(details.name + " - waiting for " + details.name + " promise to be fulfilled for " + details.identifier);
+                    return callbackRetVal.then(function(successParam) {
+                        self.log(details.name + " promise success for " + details.identifier);
+                        details.onSuccess(successParam);
+                    }, function() {
+                        if (details.onFailure) {
+                            self.log(details.name + " promise failure for " + details.identifier);
+                            details.onFailure();
+                        } else {
+                            self.log(details.name + " promise failure for " + details.identifier);
+                        }
+                    });
+                }
+                if (callbackRetVal !== false) {
+                    details.onSuccess(callbackRetVal);
+                } else {
+                    if (details.onFailure) {
+                        this.log(details.name + " - return value was 'false' for " + details.identifier + ".  Invoking failure callback.");
+                        details.onFailure();
+                    } else {
+                        this.log(details.name + " - return value was 'false' for " + details.identifier + ".  Will not proceed.");
+                    }
+                }
+                return callbackRetVal;
+            },
+            _handleNewFile: function(file, batchId, newFileWrapperList) {
+                var self = this, uuid = qq.getUniqueId(), size = -1, name = qq.getFilename(file), actualFile = file.blob || file, handler = this._customNewFileHandler ? this._customNewFileHandler : qq.bind(self._handleNewFileGeneric, self);
+                if (!qq.isInput(actualFile) && actualFile.size >= 0) {
+                    size = actualFile.size;
+                }
+                handler(actualFile, name, uuid, size, newFileWrapperList, batchId, this._options.request.uuidName, {
+                    uploadData: self._uploadData,
+                    paramsStore: self._paramsStore,
+                    addFileToHandler: function(id, file) {
+                        self._handler.add(id, file);
+                        self._netUploadedOrQueued++;
+                        self._trackButton(id);
+                    }
+                });
+            },
+            _handleNewFileGeneric: function(file, name, uuid, size, fileList, batchId) {
+                var id = this._uploadData.addFile({
+                    uuid: uuid,
+                    name: name,
+                    size: size,
+                    batchId: batchId
+                });
+                this._handler.add(id, file);
+                this._trackButton(id);
+                this._netUploadedOrQueued++;
+                fileList.push({
+                    id: id,
+                    file: file
+                });
+            },
+            _handlePasteSuccess: function(blob, extSuppliedName) {
+                var extension = blob.type.split("/")[1], name = extSuppliedName;
+                if (name == null) {
+                    name = this._options.paste.defaultName;
+                }
+                name += "." + extension;
+                this.addFiles({
+                    name: name,
+                    blob: blob
+                });
+            },
+            _handleDeleteSuccess: function(id) {
+                if (this.getUploads({
+                    id: id
+                }).status !== qq.status.DELETED) {
+                    var name = this.getName(id);
+                    this._netUploadedOrQueued--;
+                    this._netUploaded--;
+                    this._handler.expunge(id);
+                    this._uploadData.setStatus(id, qq.status.DELETED);
+                    this.log("Delete request for '" + name + "' has succeeded.");
+                }
+            },
+            _handleDeleteFailed: function(id, xhrOrXdr) {
+                var name = this.getName(id);
+                this._uploadData.setStatus(id, qq.status.DELETE_FAILED);
+                this.log("Delete request for '" + name + "' has failed.", "error");
+                if (!xhrOrXdr || xhrOrXdr.withCredentials === undefined) {
+                    this._options.callbacks.onError(id, name, "Delete request failed", xhrOrXdr);
+                } else {
+                    this._options.callbacks.onError(id, name, "Delete request failed with response code " + xhrOrXdr.status, xhrOrXdr);
+                }
+            },
+            _initExtraButton: function(spec) {
+                var button = this._createUploadButton({
+                    accept: spec.validation.acceptFiles,
+                    allowedExtensions: spec.validation.allowedExtensions,
+                    element: spec.element,
+                    folders: spec.folders,
+                    multiple: spec.multiple,
+                    title: spec.fileInputTitle
+                });
+                this._extraButtonSpecs[button.getButtonId()] = spec;
+            },
+            _initFormSupportAndParams: function() {
+                this._formSupport = qq.FormSupport && new qq.FormSupport(this._options.form, qq.bind(this.uploadStoredFiles, this), qq.bind(this.log, this));
+                if (this._formSupport && this._formSupport.attachedToForm) {
+                    this._paramsStore = this._createStore(this._options.request.params, this._formSupport.getFormInputsAsObject);
+                    this._options.autoUpload = this._formSupport.newAutoUpload;
+                    if (this._formSupport.newEndpoint) {
+                        this._options.request.endpoint = this._formSupport.newEndpoint;
+                    }
+                } else {
+                    this._paramsStore = this._createStore(this._options.request.params);
+                }
+            },
+            _isDeletePossible: function() {
+                if (!qq.DeleteFileAjaxRequester || !this._options.deleteFile.enabled) {
+                    return false;
+                }
+                if (this._options.cors.expected) {
+                    if (qq.supportedFeatures.deleteFileCorsXhr) {
+                        return true;
+                    }
+                    if (qq.supportedFeatures.deleteFileCorsXdr && this._options.cors.allowXdr) {
+                        return true;
+                    }
+                    return false;
+                }
+                return true;
+            },
+            _isAllowedExtension: function(allowed, fileName) {
+                var valid = false;
+                if (!allowed.length) {
+                    return true;
+                }
+                qq.each(allowed, function(idx, allowedExt) {
+                    if (qq.isString(allowedExt)) {
+                        var extRegex = new RegExp("\\." + allowedExt + "$", "i");
+                        if (fileName.match(extRegex) != null) {
+                            valid = true;
+                            return false;
+                        }
+                    }
+                });
+                return valid;
+            },
+            _itemError: function(code, maybeNameOrNames, item) {
+                var message = this._options.messages[code], allowedExtensions = [], names = [].concat(maybeNameOrNames), name = names[0], buttonId = this._getButtonId(item), validationBase = this._getValidationBase(buttonId), extensionsForMessage, placeholderMatch;
+                function r(name, replacement) {
+                    message = message.replace(name, replacement);
+                }
+                qq.each(validationBase.allowedExtensions, function(idx, allowedExtension) {
+                    if (qq.isString(allowedExtension)) {
+                        allowedExtensions.push(allowedExtension);
+                    }
+                });
+                extensionsForMessage = allowedExtensions.join(", ").toLowerCase();
+                r("{file}", this._options.formatFileName(name));
+                r("{extensions}", extensionsForMessage);
+                r("{sizeLimit}", this._formatSize(validationBase.sizeLimit));
+                r("{minSizeLimit}", this._formatSize(validationBase.minSizeLimit));
+                placeholderMatch = message.match(/(\{\w+\})/g);
+                if (placeholderMatch !== null) {
+                    qq.each(placeholderMatch, function(idx, placeholder) {
+                        r(placeholder, names[idx]);
+                    });
+                }
+                this._options.callbacks.onError(null, name, message, undefined);
+                return message;
+            },
+            _manualRetry: function(id, callback) {
+                if (this._onBeforeManualRetry(id)) {
+                    this._netUploadedOrQueued++;
+                    this._uploadData.setStatus(id, qq.status.UPLOAD_RETRYING);
+                    if (callback) {
+                        callback(id);
+                    } else {
+                        this._handler.retry(id);
+                    }
+                    return true;
+                }
+            },
+            _maybeAllComplete: function(id, status) {
+                var self = this, notFinished = this._getNotFinished();
+                if (status === qq.status.UPLOAD_SUCCESSFUL) {
+                    this._succeededSinceLastAllComplete.push(id);
+                } else if (status === qq.status.UPLOAD_FAILED) {
+                    this._failedSinceLastAllComplete.push(id);
+                }
+                if (notFinished === 0 && (this._succeededSinceLastAllComplete.length || this._failedSinceLastAllComplete.length)) {
+                    setTimeout(function() {
+                        self._onAllComplete(self._succeededSinceLastAllComplete, self._failedSinceLastAllComplete);
+                    }, 0);
+                }
+            },
+            _maybeHandleIos8SafariWorkaround: function() {
+                var self = this;
+                if (this._options.workarounds.ios8SafariUploads && qq.ios800() && qq.iosSafari()) {
+                    setTimeout(function() {
+                        window.alert(self._options.messages.unsupportedBrowserIos8Safari);
+                    }, 0);
+                    throw new qq.Error(this._options.messages.unsupportedBrowserIos8Safari);
+                }
+            },
+            _maybeParseAndSendUploadError: function(id, name, response, xhr) {
+                if (!response.success) {
+                    if (xhr && xhr.status !== 200 && !response.error) {
+                        this._options.callbacks.onError(id, name, "XHR returned response code " + xhr.status, xhr);
+                    } else {
+                        var errorReason = response.error ? response.error : this._options.text.defaultResponseError;
+                        this._options.callbacks.onError(id, name, errorReason, xhr);
+                    }
+                }
+            },
+            _maybeProcessNextItemAfterOnValidateCallback: function(validItem, items, index, params, endpoint) {
+                var self = this;
+                if (items.length > index) {
+                    if (validItem || !this._options.validation.stopOnFirstInvalidFile) {
+                        setTimeout(function() {
+                            var validationDescriptor = self._getValidationDescriptor(items[index]), buttonId = self._getButtonId(items[index].file), button = self._getButton(buttonId);
+                            self._handleCheckedCallback({
+                                name: "onValidate",
+                                callback: qq.bind(self._options.callbacks.onValidate, self, validationDescriptor, button),
+                                onSuccess: qq.bind(self._onValidateCallbackSuccess, self, items, index, params, endpoint),
+                                onFailure: qq.bind(self._onValidateCallbackFailure, self, items, index, params, endpoint),
+                                identifier: "Item '" + validationDescriptor.name + "', size: " + validationDescriptor.size
+                            });
+                        }, 0);
+                    } else if (!validItem) {
+                        for (;index < items.length; index++) {
+                            self._fileOrBlobRejected(items[index].id);
+                        }
+                    }
+                }
+            },
+            _onAllComplete: function(successful, failed) {
+                this._totalProgress && this._totalProgress.onAllComplete(successful, failed, this._preventRetries);
+                this._options.callbacks.onAllComplete(qq.extend([], successful), qq.extend([], failed));
+                this._succeededSinceLastAllComplete = [];
+                this._failedSinceLastAllComplete = [];
+            },
+            _onAutoRetry: function(id, name, responseJSON, xhr, callback) {
+                var self = this;
+                self._preventRetries[id] = responseJSON[self._options.retry.preventRetryResponseProperty];
+                if (self._shouldAutoRetry(id, name, responseJSON)) {
+                    var retryWaitPeriod = self._options.retry.autoAttemptDelay * 1e3;
+                    self._maybeParseAndSendUploadError.apply(self, arguments);
+                    self._options.callbacks.onAutoRetry(id, name, self._autoRetries[id]);
+                    self._onBeforeAutoRetry(id, name);
+                    self._uploadData.setStatus(id, qq.status.UPLOAD_RETRYING);
+                    self._retryTimeouts[id] = setTimeout(function() {
+                        self.log("Starting retry for " + name + "...");
+                        if (callback) {
+                            callback(id);
+                        } else {
+                            self._handler.retry(id);
+                        }
+                    }, retryWaitPeriod);
+                    return true;
+                }
+            },
+            _onBeforeAutoRetry: function(id, name) {
+                this.log("Waiting " + this._options.retry.autoAttemptDelay + " seconds before retrying " + name + "...");
+            },
+            _onBeforeManualRetry: function(id) {
+                var itemLimit = this._currentItemLimit, fileName;
+                if (this._preventRetries[id]) {
+                    this.log("Retries are forbidden for id " + id, "warn");
+                    return false;
+                } else if (this._handler.isValid(id)) {
+                    fileName = this.getName(id);
+                    if (this._options.callbacks.onManualRetry(id, fileName) === false) {
+                        return false;
+                    }
+                    if (itemLimit > 0 && this._netUploadedOrQueued + 1 > itemLimit) {
+                        this._itemError("retryFailTooManyItems");
+                        return false;
+                    }
+                    this.log("Retrying upload for '" + fileName + "' (id: " + id + ")...");
+                    return true;
+                } else {
+                    this.log("'" + id + "' is not a valid file ID", "error");
+                    return false;
+                }
+            },
+            _onCancel: function(id, name) {
+                this._netUploadedOrQueued--;
+                clearTimeout(this._retryTimeouts[id]);
+                var storedItemIndex = qq.indexOf(this._storedIds, id);
+                if (!this._options.autoUpload && storedItemIndex >= 0) {
+                    this._storedIds.splice(storedItemIndex, 1);
+                }
+                this._uploadData.setStatus(id, qq.status.CANCELED);
+            },
+            _onComplete: function(id, name, result, xhr) {
+                if (!result.success) {
+                    this._netUploadedOrQueued--;
+                    this._uploadData.setStatus(id, qq.status.UPLOAD_FAILED);
+                    if (result[this._options.retry.preventRetryResponseProperty] === true) {
+                        this._preventRetries[id] = true;
+                    }
+                } else {
+                    if (result.thumbnailUrl) {
+                        this._thumbnailUrls[id] = result.thumbnailUrl;
+                    }
+                    this._netUploaded++;
+                    this._uploadData.setStatus(id, qq.status.UPLOAD_SUCCESSFUL);
+                }
+                this._maybeParseAndSendUploadError(id, name, result, xhr);
+                return result.success ? true : false;
+            },
+            _onDelete: function(id) {
+                this._uploadData.setStatus(id, qq.status.DELETING);
+            },
+            _onDeleteComplete: function(id, xhrOrXdr, isError) {
+                var name = this.getName(id);
+                if (isError) {
+                    this._handleDeleteFailed(id, xhrOrXdr);
+                } else {
+                    this._handleDeleteSuccess(id);
+                }
+            },
+            _onInputChange: function(input) {
+                var fileIndex;
+                if (qq.supportedFeatures.ajaxUploading) {
+                    for (fileIndex = 0; fileIndex < input.files.length; fileIndex++) {
+                        this._annotateWithButtonId(input.files[fileIndex], input);
+                    }
+                    this.addFiles(input.files);
+                } else if (input.value.length > 0) {
+                    this.addFiles(input);
+                }
+                qq.each(this._buttons, function(idx, button) {
+                    button.reset();
+                });
+            },
+            _onProgress: function(id, name, loaded, total) {
+                this._totalProgress && this._totalProgress.onIndividualProgress(id, loaded, total);
+            },
+            _onSubmit: function(id, name) {},
+            _onSubmitCallbackSuccess: function(id, name) {
+                this._onSubmit.apply(this, arguments);
+                this._uploadData.setStatus(id, qq.status.SUBMITTED);
+                this._onSubmitted.apply(this, arguments);
+                if (this._options.autoUpload) {
+                    this._options.callbacks.onSubmitted.apply(this, arguments);
+                    this._uploadFile(id);
+                } else {
+                    this._storeForLater(id);
+                    this._options.callbacks.onSubmitted.apply(this, arguments);
+                }
+            },
+            _onSubmitDelete: function(id, onSuccessCallback, additionalMandatedParams) {
+                var uuid = this.getUuid(id), adjustedOnSuccessCallback;
+                if (onSuccessCallback) {
+                    adjustedOnSuccessCallback = qq.bind(onSuccessCallback, this, id, uuid, additionalMandatedParams);
+                }
+                if (this._isDeletePossible()) {
+                    this._handleCheckedCallback({
+                        name: "onSubmitDelete",
+                        callback: qq.bind(this._options.callbacks.onSubmitDelete, this, id),
+                        onSuccess: adjustedOnSuccessCallback || qq.bind(this._deleteHandler.sendDelete, this, id, uuid, additionalMandatedParams),
+                        identifier: id
+                    });
+                    return true;
+                } else {
+                    this.log("Delete request ignored for ID " + id + ", delete feature is disabled or request not possible " + "due to CORS on a user agent that does not support pre-flighting.", "warn");
+                    return false;
+                }
+            },
+            _onSubmitted: function(id) {},
+            _onTotalProgress: function(loaded, total) {
+                this._options.callbacks.onTotalProgress(loaded, total);
+            },
+            _onUploadPrep: function(id) {},
+            _onUpload: function(id, name) {
+                this._uploadData.setStatus(id, qq.status.UPLOADING);
+            },
+            _onUploadChunk: function(id, chunkData) {},
+            _onUploadStatusChange: function(id, oldStatus, newStatus) {
+                if (newStatus === qq.status.PAUSED) {
+                    clearTimeout(this._retryTimeouts[id]);
+                }
+            },
+            _onValidateBatchCallbackFailure: function(fileWrappers) {
+                var self = this;
+                qq.each(fileWrappers, function(idx, fileWrapper) {
+                    self._fileOrBlobRejected(fileWrapper.id);
+                });
+            },
+            _onValidateBatchCallbackSuccess: function(validationDescriptors, items, params, endpoint, button) {
+                var errorMessage, itemLimit = this._currentItemLimit, proposedNetFilesUploadedOrQueued = this._netUploadedOrQueued;
+                if (itemLimit === 0 || proposedNetFilesUploadedOrQueued <= itemLimit) {
+                    if (items.length > 0) {
+                        this._handleCheckedCallback({
+                            name: "onValidate",
+                            callback: qq.bind(this._options.callbacks.onValidate, this, validationDescriptors[0], button),
+                            onSuccess: qq.bind(this._onValidateCallbackSuccess, this, items, 0, params, endpoint),
+                            onFailure: qq.bind(this._onValidateCallbackFailure, this, items, 0, params, endpoint),
+                            identifier: "Item '" + items[0].file.name + "', size: " + items[0].file.size
+                        });
+                    } else {
+                        this._itemError("noFilesError");
+                    }
+                } else {
+                    this._onValidateBatchCallbackFailure(items);
+                    errorMessage = this._options.messages.tooManyItemsError.replace(/\{netItems\}/g, proposedNetFilesUploadedOrQueued).replace(/\{itemLimit\}/g, itemLimit);
+                    this._batchError(errorMessage);
+                }
+            },
+            _onValidateCallbackFailure: function(items, index, params, endpoint) {
+                var nextIndex = index + 1;
+                this._fileOrBlobRejected(items[index].id, items[index].file.name);
+                this._maybeProcessNextItemAfterOnValidateCallback(false, items, nextIndex, params, endpoint);
+            },
+            _onValidateCallbackSuccess: function(items, index, params, endpoint) {
+                var self = this, nextIndex = index + 1, validationDescriptor = this._getValidationDescriptor(items[index]);
+                this._validateFileOrBlobData(items[index], validationDescriptor).then(function() {
+                    self._upload(items[index].id, params, endpoint);
+                    self._maybeProcessNextItemAfterOnValidateCallback(true, items, nextIndex, params, endpoint);
+                }, function() {
+                    self._maybeProcessNextItemAfterOnValidateCallback(false, items, nextIndex, params, endpoint);
+                });
+            },
+            _prepareItemsForUpload: function(items, params, endpoint) {
+                if (items.length === 0) {
+                    this._itemError("noFilesError");
+                    return;
+                }
+                var validationDescriptors = this._getValidationDescriptors(items), buttonId = this._getButtonId(items[0].file), button = this._getButton(buttonId);
+                this._handleCheckedCallback({
+                    name: "onValidateBatch",
+                    callback: qq.bind(this._options.callbacks.onValidateBatch, this, validationDescriptors, button),
+                    onSuccess: qq.bind(this._onValidateBatchCallbackSuccess, this, validationDescriptors, items, params, endpoint, button),
+                    onFailure: qq.bind(this._onValidateBatchCallbackFailure, this, items),
+                    identifier: "batch validation"
+                });
+            },
+            _preventLeaveInProgress: function() {
+                var self = this;
+                this._disposeSupport.attach(window, "beforeunload", function(e) {
+                    if (self.getInProgress()) {
+                        e = e || window.event;
+                        e.returnValue = self._options.messages.onLeave;
+                        return self._options.messages.onLeave;
+                    }
+                });
+            },
+            _refreshSessionData: function() {
+                var self = this, options = this._options.session;
+                if (qq.Session && this._options.session.endpoint != null) {
+                    if (!this._session) {
+                        qq.extend(options, {
+                            cors: this._options.cors
+                        });
+                        options.log = qq.bind(this.log, this);
+                        options.addFileRecord = qq.bind(this._addCannedFile, this);
+                        this._session = new qq.Session(options);
+                    }
+                    setTimeout(function() {
+                        self._session.refresh().then(function(response, xhrOrXdr) {
+                            self._sessionRequestComplete();
+                            self._options.callbacks.onSessionRequestComplete(response, true, xhrOrXdr);
+                        }, function(response, xhrOrXdr) {
+                            self._options.callbacks.onSessionRequestComplete(response, false, xhrOrXdr);
+                        });
+                    }, 0);
+                }
+            },
+            _sessionRequestComplete: function() {},
+            _setSize: function(id, newSize) {
+                this._uploadData.updateSize(id, newSize);
+                this._totalProgress && this._totalProgress.onNewSize(id);
+            },
+            _shouldAutoRetry: function(id, name, responseJSON) {
+                var uploadData = this._uploadData.retrieve({
+                    id: id
+                });
+                if (!this._preventRetries[id] && this._options.retry.enableAuto && uploadData.status !== qq.status.PAUSED) {
+                    if (this._autoRetries[id] === undefined) {
+                        this._autoRetries[id] = 0;
+                    }
+                    if (this._autoRetries[id] < this._options.retry.maxAutoAttempts) {
+                        this._autoRetries[id] += 1;
+                        return true;
+                    }
+                }
+                return false;
+            },
+            _storeForLater: function(id) {
+                this._storedIds.push(id);
+            },
+            _trackButton: function(id) {
+                var buttonId;
+                if (qq.supportedFeatures.ajaxUploading) {
+                    buttonId = this._handler.getFile(id).qqButtonId;
+                } else {
+                    buttonId = this._getButtonId(this._handler.getInput(id));
+                }
+                if (buttonId) {
+                    this._buttonIdsForFileIds[id] = buttonId;
+                }
+            },
+            _updateFormSupportAndParams: function(formElementOrId) {
+                this._options.form.element = formElementOrId;
+                this._formSupport = qq.FormSupport && new qq.FormSupport(this._options.form, qq.bind(this.uploadStoredFiles, this), qq.bind(this.log, this));
+                if (this._formSupport && this._formSupport.attachedToForm) {
+                    this._paramsStore.addReadOnly(null, this._formSupport.getFormInputsAsObject);
+                    this._options.autoUpload = this._formSupport.newAutoUpload;
+                    if (this._formSupport.newEndpoint) {
+                        this.setEndpoint(this._formSupport.newEndpoint);
+                    }
+                }
+            },
+            _upload: function(id, params, endpoint) {
+                var name = this.getName(id);
+                if (params) {
+                    this.setParams(params, id);
+                }
+                if (endpoint) {
+                    this.setEndpoint(endpoint, id);
+                }
+                this._handleCheckedCallback({
+                    name: "onSubmit",
+                    callback: qq.bind(this._options.callbacks.onSubmit, this, id, name),
+                    onSuccess: qq.bind(this._onSubmitCallbackSuccess, this, id, name),
+                    onFailure: qq.bind(this._fileOrBlobRejected, this, id, name),
+                    identifier: id
+                });
+            },
+            _uploadFile: function(id) {
+                if (!this._handler.upload(id)) {
+                    this._uploadData.setStatus(id, qq.status.QUEUED);
+                }
+            },
+            _uploadStoredFiles: function() {
+                var idToUpload, stillSubmitting, self = this;
+                while (this._storedIds.length) {
+                    idToUpload = this._storedIds.shift();
+                    this._uploadFile(idToUpload);
+                }
+                stillSubmitting = this.getUploads({
+                    status: qq.status.SUBMITTING
+                }).length;
+                if (stillSubmitting) {
+                    qq.log("Still waiting for " + stillSubmitting + " files to clear submit queue. Will re-parse stored IDs array shortly.");
+                    setTimeout(function() {
+                        self._uploadStoredFiles();
+                    }, 1e3);
+                }
+            },
+            _validateFileOrBlobData: function(fileWrapper, validationDescriptor) {
+                var self = this, file = function() {
+                    if (fileWrapper.file instanceof qq.BlobProxy) {
+                        return fileWrapper.file.referenceBlob;
+                    }
+                    return fileWrapper.file;
+                }(), name = validationDescriptor.name, size = validationDescriptor.size, buttonId = this._getButtonId(fileWrapper.file), validationBase = this._getValidationBase(buttonId), validityChecker = new qq.Promise();
+                validityChecker.then(function() {}, function() {
+                    self._fileOrBlobRejected(fileWrapper.id, name);
+                });
+                if (qq.isFileOrInput(file) && !this._isAllowedExtension(validationBase.allowedExtensions, name)) {
+                    this._itemError("typeError", name, file);
+                    return validityChecker.failure();
+                }
+                if (!this._options.validation.allowEmpty && size === 0) {
+                    this._itemError("emptyError", name, file);
+                    return validityChecker.failure();
+                }
+                if (size > 0 && validationBase.sizeLimit && size > validationBase.sizeLimit) {
+                    this._itemError("sizeError", name, file);
+                    return validityChecker.failure();
+                }
+                if (size > 0 && size < validationBase.minSizeLimit) {
+                    this._itemError("minSizeError", name, file);
+                    return validityChecker.failure();
+                }
+                if (qq.ImageValidation && qq.supportedFeatures.imagePreviews && qq.isFile(file)) {
+                    new qq.ImageValidation(file, qq.bind(self.log, self)).validate(validationBase.image).then(validityChecker.success, function(errorCode) {
+                        self._itemError(errorCode + "ImageError", name, file);
+                        validityChecker.failure();
+                    });
+                } else {
+                    validityChecker.success();
+                }
+                return validityChecker;
+            },
+            _wrapCallbacks: function() {
+                var self, safeCallback, prop;
+                self = this;
+                safeCallback = function(name, callback, args) {
+                    var errorMsg;
+                    try {
+                        return callback.apply(self, args);
+                    } catch (exception) {
+                        errorMsg = exception.message || exception.toString();
+                        self.log("Caught exception in '" + name + "' callback - " + errorMsg, "error");
+                    }
+                };
+                for (prop in this._options.callbacks) {
+                    (function() {
+                        var callbackName, callbackFunc;
+                        callbackName = prop;
+                        callbackFunc = self._options.callbacks[callbackName];
+                        self._options.callbacks[callbackName] = function() {
+                            return safeCallback(callbackName, callbackFunc, arguments);
+                        };
+                    })();
+                }
+            }
+        };
+    })();
+    (function() {
+        "use strict";
+        qq.FineUploaderBasic = function(o) {
+            var self = this;
+            this._options = {
+                debug: false,
+                button: null,
+                multiple: true,
+                maxConnections: 3,
+                disableCancelForFormUploads: false,
+                autoUpload: true,
+                request: {
+                    customHeaders: {},
+                    endpoint: "/server/upload",
+                    filenameParam: "qqfilename",
+                    forceMultipart: true,
+                    inputName: "qqfile",
+                    method: "POST",
+                    params: {},
+                    paramsInBody: true,
+                    totalFileSizeName: "qqtotalfilesize",
+                    uuidName: "qquuid"
+                },
+                validation: {
+                    allowedExtensions: [],
+                    sizeLimit: 0,
+                    minSizeLimit: 0,
+                    itemLimit: 0,
+                    stopOnFirstInvalidFile: true,
+                    acceptFiles: null,
+                    image: {
+                        maxHeight: 0,
+                        maxWidth: 0,
+                        minHeight: 0,
+                        minWidth: 0
+                    },
+                    allowEmpty: false
+                },
+                callbacks: {
+                    onSubmit: function(id, name) {},
+                    onSubmitted: function(id, name) {},
+                    onComplete: function(id, name, responseJSON, maybeXhr) {},
+                    onAllComplete: function(successful, failed) {},
+                    onCancel: function(id, name) {},
+                    onUpload: function(id, name) {},
+                    onUploadChunk: function(id, name, chunkData) {},
+                    onUploadChunkSuccess: function(id, chunkData, responseJSON, xhr) {},
+                    onResume: function(id, fileName, chunkData) {},
+                    onProgress: function(id, name, loaded, total) {},
+                    onTotalProgress: function(loaded, total) {},
+                    onError: function(id, name, reason, maybeXhrOrXdr) {},
+                    onAutoRetry: function(id, name, attemptNumber) {},
+                    onManualRetry: function(id, name) {},
+                    onValidateBatch: function(fileOrBlobData) {},
+                    onValidate: function(fileOrBlobData) {},
+                    onSubmitDelete: function(id) {},
+                    onDelete: function(id) {},
+                    onDeleteComplete: function(id, xhrOrXdr, isError) {},
+                    onPasteReceived: function(blob) {},
+                    onStatusChange: function(id, oldStatus, newStatus) {},
+                    onSessionRequestComplete: function(response, success, xhrOrXdr) {}
+                },
+                messages: {
+                    typeError: "{file} has an invalid extension. Valid extension(s): {extensions}.",
+                    sizeError: "{file} is too large, maximum file size is {sizeLimit}.",
+                    minSizeError: "{file} is too small, minimum file size is {minSizeLimit}.",
+                    emptyError: "{file} is empty, please select files again without it.",
+                    noFilesError: "No files to upload.",
+                    tooManyItemsError: "Too many items ({netItems}) would be uploaded.  Item limit is {itemLimit}.",
+                    maxHeightImageError: "Image is too tall.",
+                    maxWidthImageError: "Image is too wide.",
+                    minHeightImageError: "Image is not tall enough.",
+                    minWidthImageError: "Image is not wide enough.",
+                    retryFailTooManyItems: "Retry failed - you have reached your file limit.",
+                    onLeave: "The files are being uploaded, if you leave now the upload will be canceled.",
+                    unsupportedBrowserIos8Safari: "Unrecoverable error - this browser does not permit file uploading of any kind due to serious bugs in iOS8 Safari.  Please use iOS8 Chrome until Apple fixes these issues."
+                },
+                retry: {
+                    enableAuto: false,
+                    maxAutoAttempts: 3,
+                    autoAttemptDelay: 5,
+                    preventRetryResponseProperty: "preventRetry"
+                },
+                classes: {
+                    buttonHover: "qq-upload-button-hover",
+                    buttonFocus: "qq-upload-button-focus"
+                },
+                chunking: {
+                    enabled: false,
+                    concurrent: {
+                        enabled: false
+                    },
+                    mandatory: false,
+                    paramNames: {
+                        partIndex: "qqpartindex",
+                        partByteOffset: "qqpartbyteoffset",
+                        chunkSize: "qqchunksize",
+                        totalFileSize: "qqtotalfilesize",
+                        totalParts: "qqtotalparts"
+                    },
+                    partSize: 2e6,
+                    success: {
+                        endpoint: null
+                    }
+                },
+                resume: {
+                    enabled: false,
+                    recordsExpireIn: 7,
+                    paramNames: {
+                        resuming: "qqresume"
+                    }
+                },
+                formatFileName: function(fileOrBlobName) {
+                    return fileOrBlobName;
+                },
+                text: {
+                    defaultResponseError: "Upload failure reason unknown",
+                    fileInputTitle: "file input",
+                    sizeSymbols: [ "kB", "MB", "GB", "TB", "PB", "EB" ]
+                },
+                deleteFile: {
+                    enabled: false,
+                    method: "DELETE",
+                    endpoint: "/server/upload",
+                    customHeaders: {},
+                    params: {}
+                },
+                cors: {
+                    expected: false,
+                    sendCredentials: false,
+                    allowXdr: false
+                },
+                blobs: {
+                    defaultName: "misc_data"
+                },
+                paste: {
+                    targetElement: null,
+                    defaultName: "pasted_image"
+                },
+                camera: {
+                    ios: false,
+                    button: null
+                },
+                extraButtons: [],
+                session: {
+                    endpoint: null,
+                    params: {},
+                    customHeaders: {},
+                    refreshOnReset: true
+                },
+                form: {
+                    element: "qq-form",
+                    autoUpload: false,
+                    interceptSubmit: true
+                },
+                scaling: {
+                    customResizer: null,
+                    sendOriginal: true,
+                    orient: true,
+                    defaultType: null,
+                    defaultQuality: 80,
+                    failureText: "Failed to scale",
+                    includeExif: false,
+                    sizes: []
+                },
+                workarounds: {
+                    iosEmptyVideos: true,
+                    ios8SafariUploads: true,
+                    ios8BrowserCrash: false
+                }
+            };
+            qq.extend(this._options, o, true);
+            this._buttons = [];
+            this._extraButtonSpecs = {};
+            this._buttonIdsForFileIds = [];
+            this._wrapCallbacks();
+            this._disposeSupport = new qq.DisposeSupport();
+            this._storedIds = [];
+            this._autoRetries = [];
+            this._retryTimeouts = [];
+            this._preventRetries = [];
+            this._thumbnailUrls = [];
+            this._netUploadedOrQueued = 0;
+            this._netUploaded = 0;
+            this._uploadData = this._createUploadDataTracker();
+            this._initFormSupportAndParams();
+            this._customHeadersStore = this._createStore(this._options.request.customHeaders);
+            this._deleteFileCustomHeadersStore = this._createStore(this._options.deleteFile.customHeaders);
+            this._deleteFileParamsStore = this._createStore(this._options.deleteFile.params);
+            this._endpointStore = this._createStore(this._options.request.endpoint);
+            this._deleteFileEndpointStore = this._createStore(this._options.deleteFile.endpoint);
+            this._handler = this._createUploadHandler();
+            this._deleteHandler = qq.DeleteFileAjaxRequester && this._createDeleteHandler();
+            if (this._options.button) {
+                this._defaultButtonId = this._createUploadButton({
+                    element: this._options.button,
+                    title: this._options.text.fileInputTitle
+                }).getButtonId();
+            }
+            this._generateExtraButtonSpecs();
+            this._handleCameraAccess();
+            if (this._options.paste.targetElement) {
+                if (qq.PasteSupport) {
+                    this._pasteHandler = this._createPasteHandler();
+                } else {
+                    this.log("Paste support module not found", "error");
+                }
+            }
+            this._preventLeaveInProgress();
+            this._imageGenerator = qq.ImageGenerator && new qq.ImageGenerator(qq.bind(this.log, this));
+            this._refreshSessionData();
+            this._succeededSinceLastAllComplete = [];
+            this._failedSinceLastAllComplete = [];
+            this._scaler = qq.Scaler && new qq.Scaler(this._options.scaling, qq.bind(this.log, this)) || {};
+            if (this._scaler.enabled) {
+                this._customNewFileHandler = qq.bind(this._scaler.handleNewFile, this._scaler);
+            }
+            if (qq.TotalProgress && qq.supportedFeatures.progressBar) {
+                this._totalProgress = new qq.TotalProgress(qq.bind(this._onTotalProgress, this), function(id) {
+                    var entry = self._uploadData.retrieve({
+                        id: id
+                    });
+                    return entry && entry.size || 0;
+                });
+            }
+            this._currentItemLimit = this._options.validation.itemLimit;
+        };
+        qq.FineUploaderBasic.prototype = qq.basePublicApi;
+        qq.extend(qq.FineUploaderBasic.prototype, qq.basePrivateApi);
+    })();
+    qq.AjaxRequester = function(o) {
+        "use strict";
+        var log, shouldParamsBeInQueryString, queue = [], requestData = {}, options = {
+            acceptHeader: null,
+            validMethods: [ "PATCH", "POST", "PUT" ],
+            method: "POST",
+            contentType: "application/x-www-form-urlencoded",
+            maxConnections: 3,
+            customHeaders: {},
+            endpointStore: {},
+            paramsStore: {},
+            mandatedParams: {},
+            allowXRequestedWithAndCacheControl: true,
+            successfulResponseCodes: {
+                DELETE: [ 200, 202, 204 ],
+                PATCH: [ 200, 201, 202, 203, 204 ],
+                POST: [ 200, 201, 202, 203, 204 ],
+                PUT: [ 200, 201, 202, 203, 204 ],
+                GET: [ 200 ]
+            },
+            cors: {
+                expected: false,
+                sendCredentials: false
+            },
+            log: function(str, level) {},
+            onSend: function(id) {},
+            onComplete: function(id, xhrOrXdr, isError) {},
+            onProgress: null
+        };
+        qq.extend(options, o);
+        log = options.log;
+        if (qq.indexOf(options.validMethods, options.method) < 0) {
+            throw new Error("'" + options.method + "' is not a supported method for this type of request!");
+        }
+        function isSimpleMethod() {
+            return qq.indexOf([ "GET", "POST", "HEAD" ], options.method) >= 0;
+        }
+        function containsNonSimpleHeaders(headers) {
+            var containsNonSimple = false;
+            qq.each(containsNonSimple, function(idx, header) {
+                if (qq.indexOf([ "Accept", "Accept-Language", "Content-Language", "Content-Type" ], header) < 0) {
+                    containsNonSimple = true;
+                    return false;
+                }
+            });
+            return containsNonSimple;
+        }
+        function isXdr(xhr) {
+            return options.cors.expected && xhr.withCredentials === undefined;
+        }
+        function getCorsAjaxTransport() {
+            var xhrOrXdr;
+            if (window.XMLHttpRequest || window.ActiveXObject) {
+                xhrOrXdr = qq.createXhrInstance();
+                if (xhrOrXdr.withCredentials === undefined) {
+                    xhrOrXdr = new XDomainRequest();
+                    xhrOrXdr.onload = function() {};
+                    xhrOrXdr.onerror = function() {};
+                    xhrOrXdr.ontimeout = function() {};
+                    xhrOrXdr.onprogress = function() {};
+                }
+            }
+            return xhrOrXdr;
+        }
+        function getXhrOrXdr(id, suppliedXhr) {
+            var xhrOrXdr = requestData[id].xhr;
+            if (!xhrOrXdr) {
+                if (suppliedXhr) {
+                    xhrOrXdr = suppliedXhr;
+                } else {
+                    if (options.cors.expected) {
+                        xhrOrXdr = getCorsAjaxTransport();
+                    } else {
+                        xhrOrXdr = qq.createXhrInstance();
+                    }
+                }
+                requestData[id].xhr = xhrOrXdr;
+            }
+            return xhrOrXdr;
+        }
+        function dequeue(id) {
+            var i = qq.indexOf(queue, id), max = options.maxConnections, nextId;
+            delete requestData[id];
+            queue.splice(i, 1);
+            if (queue.length >= max && i < max) {
+                nextId = queue[max - 1];
+                sendRequest(nextId);
+            }
+        }
+        function onComplete(id, xdrError) {
+            var xhr = getXhrOrXdr(id), method = options.method, isError = xdrError === true;
+            dequeue(id);
+            if (isError) {
+                log(method + " request for " + id + " has failed", "error");
+            } else if (!isXdr(xhr) && !isResponseSuccessful(xhr.status)) {
+                isError = true;
+                log(method + " request for " + id + " has failed - response code " + xhr.status, "error");
+            }
+            options.onComplete(id, xhr, isError);
+        }
+        function getParams(id) {
+            var onDemandParams = requestData[id].additionalParams, mandatedParams = options.mandatedParams, params;
+            if (options.paramsStore.get) {
+                params = options.paramsStore.get(id);
+            }
+            if (onDemandParams) {
+                qq.each(onDemandParams, function(name, val) {
+                    params = params || {};
+                    params[name] = val;
+                });
+            }
+            if (mandatedParams) {
+                qq.each(mandatedParams, function(name, val) {
+                    params = params || {};
+                    params[name] = val;
+                });
+            }
+            return params;
+        }
+        function sendRequest(id, optXhr) {
+            var xhr = getXhrOrXdr(id, optXhr), method = options.method, params = getParams(id), payload = requestData[id].payload, url;
+            options.onSend(id);
+            url = createUrl(id, params, requestData[id].additionalQueryParams);
+            if (isXdr(xhr)) {
+                xhr.onload = getXdrLoadHandler(id);
+                xhr.onerror = getXdrErrorHandler(id);
+            } else {
+                xhr.onreadystatechange = getXhrReadyStateChangeHandler(id);
+            }
+            registerForUploadProgress(id);
+            xhr.open(method, url, true);
+            if (options.cors.expected && options.cors.sendCredentials && !isXdr(xhr)) {
+                xhr.withCredentials = true;
+            }
+            setHeaders(id);
+            log("Sending " + method + " request for " + id);
+            if (payload) {
+                xhr.send(payload);
+            } else if (shouldParamsBeInQueryString || !params) {
+                xhr.send();
+            } else if (params && options.contentType && options.contentType.toLowerCase().indexOf("application/x-www-form-urlencoded") >= 0) {
+                xhr.send(qq.obj2url(params, ""));
+            } else if (params && options.contentType && options.contentType.toLowerCase().indexOf("application/json") >= 0) {
+                xhr.send(JSON.stringify(params));
+            } else {
+                xhr.send(params);
+            }
+            return xhr;
+        }
+        function createUrl(id, params, additionalQueryParams) {
+            var endpoint = options.endpointStore.get(id), addToPath = requestData[id].addToPath;
+            if (addToPath != undefined) {
+                endpoint += "/" + addToPath;
+            }
+            if (shouldParamsBeInQueryString && params) {
+                endpoint = qq.obj2url(params, endpoint);
+            }
+            if (additionalQueryParams) {
+                endpoint = qq.obj2url(additionalQueryParams, endpoint);
+            }
+            return endpoint;
+        }
+        function getXhrReadyStateChangeHandler(id) {
+            return function() {
+                if (getXhrOrXdr(id).readyState === 4) {
+                    onComplete(id);
+                }
+            };
+        }
+        function registerForUploadProgress(id) {
+            var onProgress = options.onProgress;
+            if (onProgress) {
+                getXhrOrXdr(id).upload.onprogress = function(e) {
+                    if (e.lengthComputable) {
+                        onProgress(id, e.loaded, e.total);
+                    }
+                };
+            }
+        }
+        function getXdrLoadHandler(id) {
+            return function() {
+                onComplete(id);
+            };
+        }
+        function getXdrErrorHandler(id) {
+            return function() {
+                onComplete(id, true);
+            };
+        }
+        function setHeaders(id) {
+            var xhr = getXhrOrXdr(id), customHeaders = options.customHeaders, onDemandHeaders = requestData[id].additionalHeaders || {}, method = options.method, allHeaders = {};
+            if (!isXdr(xhr)) {
+                options.acceptHeader && xhr.setRequestHeader("Accept", options.acceptHeader);
+                if (options.allowXRequestedWithAndCacheControl) {
+                    if (!options.cors.expected || (!isSimpleMethod() || containsNonSimpleHeaders(customHeaders))) {
+                        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+                        xhr.setRequestHeader("Cache-Control", "no-cache");
+                    }
+                }
+                if (options.contentType && (method === "POST" || method === "PUT")) {
+                    xhr.setRequestHeader("Content-Type", options.contentType);
+                }
+                qq.extend(allHeaders, qq.isFunction(customHeaders) ? customHeaders(id) : customHeaders);
+                qq.extend(allHeaders, onDemandHeaders);
+                qq.each(allHeaders, function(name, val) {
+                    xhr.setRequestHeader(name, val);
+                });
+            }
+        }
+        function isResponseSuccessful(responseCode) {
+            return qq.indexOf(options.successfulResponseCodes[options.method], responseCode) >= 0;
+        }
+        function prepareToSend(id, optXhr, addToPath, additionalParams, additionalQueryParams, additionalHeaders, payload) {
+            requestData[id] = {
+                addToPath: addToPath,
+                additionalParams: additionalParams,
+                additionalQueryParams: additionalQueryParams,
+                additionalHeaders: additionalHeaders,
+                payload: payload
+            };
+            var len = queue.push(id);
+            if (len <= options.maxConnections) {
+                return sendRequest(id, optXhr);
+            }
+        }
+        shouldParamsBeInQueryString = options.method === "GET" || options.method === "DELETE";
+        qq.extend(this, {
+            initTransport: function(id) {
+                var path, params, headers, payload, cacheBuster, additionalQueryParams;
+                return {
+                    withPath: function(appendToPath) {
+                        path = appendToPath;
+                        return this;
+                    },
+                    withParams: function(additionalParams) {
+                        params = additionalParams;
+                        return this;
+                    },
+                    withQueryParams: function(_additionalQueryParams_) {
+                        additionalQueryParams = _additionalQueryParams_;
+                        return this;
+                    },
+                    withHeaders: function(additionalHeaders) {
+                        headers = additionalHeaders;
+                        return this;
+                    },
+                    withPayload: function(thePayload) {
+                        payload = thePayload;
+                        return this;
+                    },
+                    withCacheBuster: function() {
+                        cacheBuster = true;
+                        return this;
+                    },
+                    send: function(optXhr) {
+                        if (cacheBuster && qq.indexOf([ "GET", "DELETE" ], options.method) >= 0) {
+                            params.qqtimestamp = new Date().getTime();
+                        }
+                        return prepareToSend(id, optXhr, path, params, additionalQueryParams, headers, payload);
+                    }
+                };
+            },
+            canceled: function(id) {
+                dequeue(id);
+            }
+        });
+    };
+    qq.UploadHandler = function(spec) {
+        "use strict";
+        var proxy = spec.proxy, fileState = {}, onCancel = proxy.onCancel, getName = proxy.getName;
+        qq.extend(this, {
+            add: function(id, fileItem) {
+                fileState[id] = fileItem;
+                fileState[id].temp = {};
+            },
+            cancel: function(id) {
+                var self = this, cancelFinalizationEffort = new qq.Promise(), onCancelRetVal = onCancel(id, getName(id), cancelFinalizationEffort);
+                onCancelRetVal.then(function() {
+                    if (self.isValid(id)) {
+                        fileState[id].canceled = true;
+                        self.expunge(id);
+                    }
+                    cancelFinalizationEffort.success();
+                });
+            },
+            expunge: function(id) {
+                delete fileState[id];
+            },
+            getThirdPartyFileId: function(id) {
+                return fileState[id].key;
+            },
+            isValid: function(id) {
+                return fileState[id] !== undefined;
+            },
+            reset: function() {
+                fileState = {};
+            },
+            _getFileState: function(id) {
+                return fileState[id];
+            },
+            _setThirdPartyFileId: function(id, thirdPartyFileId) {
+                fileState[id].key = thirdPartyFileId;
+            },
+            _wasCanceled: function(id) {
+                return !!fileState[id].canceled;
+            }
+        });
+    };
+    qq.UploadHandlerController = function(o, namespace) {
+        "use strict";
+        var controller = this, chunkingPossible = false, concurrentChunkingPossible = false, chunking, preventRetryResponse, log, handler, options = {
+            paramsStore: {},
+            maxConnections: 3,
+            chunking: {
+                enabled: false,
+                multiple: {
+                    enabled: false
+                }
+            },
+            log: function(str, level) {},
+            onProgress: function(id, fileName, loaded, total) {},
+            onComplete: function(id, fileName, response, xhr) {},
+            onCancel: function(id, fileName) {},
+            onUploadPrep: function(id) {},
+            onUpload: function(id, fileName) {},
+            onUploadChunk: function(id, fileName, chunkData) {},
+            onUploadChunkSuccess: function(id, chunkData, response, xhr) {},
+            onAutoRetry: function(id, fileName, response, xhr) {},
+            onResume: function(id, fileName, chunkData) {},
+            onUuidChanged: function(id, newUuid) {},
+            getName: function(id) {},
+            setSize: function(id, newSize) {},
+            isQueued: function(id) {},
+            getIdsInProxyGroup: function(id) {},
+            getIdsInBatch: function(id) {}
+        }, chunked = {
+            done: function(id, chunkIdx, response, xhr) {
+                var chunkData = handler._getChunkData(id, chunkIdx);
+                handler._getFileState(id).attemptingResume = false;
+                delete handler._getFileState(id).temp.chunkProgress[chunkIdx];
+                handler._getFileState(id).loaded += chunkData.size;
+                options.onUploadChunkSuccess(id, handler._getChunkDataForCallback(chunkData), response, xhr);
+            },
+            finalize: function(id) {
+                var size = options.getSize(id), name = options.getName(id);
+                log("All chunks have been uploaded for " + id + " - finalizing....");
+                handler.finalizeChunks(id).then(function(response, xhr) {
+                    log("Finalize successful for " + id);
+                    var normaizedResponse = upload.normalizeResponse(response, true);
+                    options.onProgress(id, name, size, size);
+                    handler._maybeDeletePersistedChunkData(id);
+                    upload.cleanup(id, normaizedResponse, xhr);
+                }, function(response, xhr) {
+                    var normaizedResponse = upload.normalizeResponse(response, false);
+                    log("Problem finalizing chunks for file ID " + id + " - " + normaizedResponse.error, "error");
+                    if (normaizedResponse.reset) {
+                        chunked.reset(id);
+                    }
+                    if (!options.onAutoRetry(id, name, normaizedResponse, xhr)) {
+                        upload.cleanup(id, normaizedResponse, xhr);
+                    }
+                });
+            },
+            handleFailure: function(chunkIdx, id, response, xhr) {
+                var name = options.getName(id);
+                log("Chunked upload request failed for " + id + ", chunk " + chunkIdx);
+                handler.clearCachedChunk(id, chunkIdx);
+                var responseToReport = upload.normalizeResponse(response, false), inProgressIdx;
+                if (responseToReport.reset) {
+                    chunked.reset(id);
+                } else {
+                    inProgressIdx = qq.indexOf(handler._getFileState(id).chunking.inProgress, chunkIdx);
+                    if (inProgressIdx >= 0) {
+                        handler._getFileState(id).chunking.inProgress.splice(inProgressIdx, 1);
+                        handler._getFileState(id).chunking.remaining.unshift(chunkIdx);
+                    }
+                }
+                if (!handler._getFileState(id).temp.ignoreFailure) {
+                    if (concurrentChunkingPossible) {
+                        handler._getFileState(id).temp.ignoreFailure = true;
+                        log(qq.format("Going to attempt to abort these chunks: {}. These are currently in-progress: {}.", JSON.stringify(Object.keys(handler._getXhrs(id))), JSON.stringify(handler._getFileState(id).chunking.inProgress)));
+                        qq.each(handler._getXhrs(id), function(ckid, ckXhr) {
+                            log(qq.format("Attempting to abort file {}.{}. XHR readyState {}. ", id, ckid, ckXhr.readyState));
+                            ckXhr.abort();
+                            ckXhr._cancelled = true;
+                        });
+                        handler.moveInProgressToRemaining(id);
+                        connectionManager.free(id, true);
+                    }
+                    if (!options.onAutoRetry(id, name, responseToReport, xhr)) {
+                        upload.cleanup(id, responseToReport, xhr);
+                    }
+                }
+            },
+            hasMoreParts: function(id) {
+                return !!handler._getFileState(id).chunking.remaining.length;
+            },
+            nextPart: function(id) {
+                var nextIdx = handler._getFileState(id).chunking.remaining.shift();
+                if (nextIdx >= handler._getTotalChunks(id)) {
+                    nextIdx = null;
+                }
+                return nextIdx;
+            },
+            reset: function(id) {
+                log("Server or callback has ordered chunking effort to be restarted on next attempt for item ID " + id, "error");
+                handler._maybeDeletePersistedChunkData(id);
+                handler.reevaluateChunking(id);
+                handler._getFileState(id).loaded = 0;
+            },
+            sendNext: function(id) {
+                var size = options.getSize(id), name = options.getName(id), chunkIdx = chunked.nextPart(id), chunkData = handler._getChunkData(id, chunkIdx), resuming = handler._getFileState(id).attemptingResume, inProgressChunks = handler._getFileState(id).chunking.inProgress || [];
+                if (handler._getFileState(id).loaded == null) {
+                    handler._getFileState(id).loaded = 0;
+                }
+                if (resuming && options.onResume(id, name, chunkData) === false) {
+                    chunked.reset(id);
+                    chunkIdx = chunked.nextPart(id);
+                    chunkData = handler._getChunkData(id, chunkIdx);
+                    resuming = false;
+                }
+                if (chunkIdx == null && inProgressChunks.length === 0) {
+                    chunked.finalize(id);
+                } else {
+                    log(qq.format("Sending chunked upload request for item {}.{}, bytes {}-{} of {}.", id, chunkIdx, chunkData.start + 1, chunkData.end, size));
+                    options.onUploadChunk(id, name, handler._getChunkDataForCallback(chunkData));
+                    inProgressChunks.push(chunkIdx);
+                    handler._getFileState(id).chunking.inProgress = inProgressChunks;
+                    if (concurrentChunkingPossible) {
+                        connectionManager.open(id, chunkIdx);
+                    }
+                    if (concurrentChunkingPossible && connectionManager.available() && handler._getFileState(id).chunking.remaining.length) {
+                        chunked.sendNext(id);
+                    }
+                    if (chunkData.blob.size === 0) {
+                        log(qq.format("Chunk {} for file {} will not be uploaded, zero sized chunk.", chunkIdx, id), "error");
+                        chunked.handleFailure(chunkIdx, id, "File is no longer available", null);
+                    } else {
+                        handler.uploadChunk(id, chunkIdx, resuming).then(function success(response, xhr) {
+                            log("Chunked upload request succeeded for " + id + ", chunk " + chunkIdx);
+                            handler.clearCachedChunk(id, chunkIdx);
+                            var inProgressChunks = handler._getFileState(id).chunking.inProgress || [], responseToReport = upload.normalizeResponse(response, true), inProgressChunkIdx = qq.indexOf(inProgressChunks, chunkIdx);
+                            log(qq.format("Chunk {} for file {} uploaded successfully.", chunkIdx, id));
+                            chunked.done(id, chunkIdx, responseToReport, xhr);
+                            if (inProgressChunkIdx >= 0) {
+                                inProgressChunks.splice(inProgressChunkIdx, 1);
+                            }
+                            handler._maybePersistChunkedState(id);
+                            if (!chunked.hasMoreParts(id) && inProgressChunks.length === 0) {
+                                chunked.finalize(id);
+                            } else if (chunked.hasMoreParts(id)) {
+                                chunked.sendNext(id);
+                            } else {
+                                log(qq.format("File ID {} has no more chunks to send and these chunk indexes are still marked as in-progress: {}", id, JSON.stringify(inProgressChunks)));
+                            }
+                        }, function failure(response, xhr) {
+                            chunked.handleFailure(chunkIdx, id, response, xhr);
+                        }).done(function() {
+                            handler.clearXhr(id, chunkIdx);
+                        });
+                    }
+                }
+            }
+        }, connectionManager = {
+            _open: [],
+            _openChunks: {},
+            _waiting: [],
+            available: function() {
+                var max = options.maxConnections, openChunkEntriesCount = 0, openChunksCount = 0;
+                qq.each(connectionManager._openChunks, function(fileId, openChunkIndexes) {
+                    openChunkEntriesCount++;
+                    openChunksCount += openChunkIndexes.length;
+                });
+                return max - (connectionManager._open.length - openChunkEntriesCount + openChunksCount);
+            },
+            free: function(id, dontAllowNext) {
+                var allowNext = !dontAllowNext, waitingIndex = qq.indexOf(connectionManager._waiting, id), connectionsIndex = qq.indexOf(connectionManager._open, id), nextId;
+                delete connectionManager._openChunks[id];
+                if (upload.getProxyOrBlob(id) instanceof qq.BlobProxy) {
+                    log("Generated blob upload has ended for " + id + ", disposing generated blob.");
+                    delete handler._getFileState(id).file;
+                }
+                if (waitingIndex >= 0) {
+                    connectionManager._waiting.splice(waitingIndex, 1);
+                } else if (allowNext && connectionsIndex >= 0) {
+                    connectionManager._open.splice(connectionsIndex, 1);
+                    nextId = connectionManager._waiting.shift();
+                    if (nextId >= 0) {
+                        connectionManager._open.push(nextId);
+                        upload.start(nextId);
+                    }
+                }
+            },
+            getWaitingOrConnected: function() {
+                var waitingOrConnected = [];
+                qq.each(connectionManager._openChunks, function(fileId, chunks) {
+                    if (chunks && chunks.length) {
+                        waitingOrConnected.push(parseInt(fileId));
+                    }
+                });
+                qq.each(connectionManager._open, function(idx, fileId) {
+                    if (!connectionManager._openChunks[fileId]) {
+                        waitingOrConnected.push(parseInt(fileId));
+                    }
+                });
+                waitingOrConnected = waitingOrConnected.concat(connectionManager._waiting);
+                return waitingOrConnected;
+            },
+            isUsingConnection: function(id) {
+                return qq.indexOf(connectionManager._open, id) >= 0;
+            },
+            open: function(id, chunkIdx) {
+                if (chunkIdx == null) {
+                    connectionManager._waiting.push(id);
+                }
+                if (connectionManager.available()) {
+                    if (chunkIdx == null) {
+                        connectionManager._waiting.pop();
+                        connectionManager._open.push(id);
+                    } else {
+                        (function() {
+                            var openChunksEntry = connectionManager._openChunks[id] || [];
+                            openChunksEntry.push(chunkIdx);
+                            connectionManager._openChunks[id] = openChunksEntry;
+                        })();
+                    }
+                    return true;
+                }
+                return false;
+            },
+            reset: function() {
+                connectionManager._waiting = [];
+                connectionManager._open = [];
+            }
+        }, simple = {
+            send: function(id, name) {
+                handler._getFileState(id).loaded = 0;
+                log("Sending simple upload request for " + id);
+                handler.uploadFile(id).then(function(response, optXhr) {
+                    log("Simple upload request succeeded for " + id);
+                    var responseToReport = upload.normalizeResponse(response, true), size = options.getSize(id);
+                    options.onProgress(id, name, size, size);
+                    upload.maybeNewUuid(id, responseToReport);
+                    upload.cleanup(id, responseToReport, optXhr);
+                }, function(response, optXhr) {
+                    log("Simple upload request failed for " + id);
+                    var responseToReport = upload.normalizeResponse(response, false);
+                    if (!options.onAutoRetry(id, name, responseToReport, optXhr)) {
+                        upload.cleanup(id, responseToReport, optXhr);
+                    }
+                });
+            }
+        }, upload = {
+            cancel: function(id) {
+                log("Cancelling " + id);
+                options.paramsStore.remove(id);
+                connectionManager.free(id);
+            },
+            cleanup: function(id, response, optXhr) {
+                var name = options.getName(id);
+                options.onComplete(id, name, response, optXhr);
+                if (handler._getFileState(id)) {
+                    handler._clearXhrs && handler._clearXhrs(id);
+                }
+                connectionManager.free(id);
+            },
+            getProxyOrBlob: function(id) {
+                return handler.getProxy && handler.getProxy(id) || handler.getFile && handler.getFile(id);
+            },
+            initHandler: function() {
+                var handlerType = namespace ? qq[namespace] : qq.traditional, handlerModuleSubtype = qq.supportedFeatures.ajaxUploading ? "Xhr" : "Form";
+                handler = new handlerType[handlerModuleSubtype + "UploadHandler"](options, {
+                    getDataByUuid: options.getDataByUuid,
+                    getName: options.getName,
+                    getSize: options.getSize,
+                    getUuid: options.getUuid,
+                    log: log,
+                    onCancel: options.onCancel,
+                    onProgress: options.onProgress,
+                    onUuidChanged: options.onUuidChanged
+                });
+                if (handler._removeExpiredChunkingRecords) {
+                    handler._removeExpiredChunkingRecords();
+                }
+            },
+            isDeferredEligibleForUpload: function(id) {
+                return options.isQueued(id);
+            },
+            maybeDefer: function(id, blob) {
+                if (blob && !handler.getFile(id) && blob instanceof qq.BlobProxy) {
+                    options.onUploadPrep(id);
+                    log("Attempting to generate a blob on-demand for " + id);
+                    blob.create().then(function(generatedBlob) {
+                        log("Generated an on-demand blob for " + id);
+                        handler.updateBlob(id, generatedBlob);
+                        options.setSize(id, generatedBlob.size);
+                        handler.reevaluateChunking(id);
+                        upload.maybeSendDeferredFiles(id);
+                    }, function(errorMessage) {
+                        var errorResponse = {};
+                        if (errorMessage) {
+                            errorResponse.error = errorMessage;
+                        }
+                        log(qq.format("Failed to generate blob for ID {}.  Error message: {}.", id, errorMessage), "error");
+                        options.onComplete(id, options.getName(id), qq.extend(errorResponse, preventRetryResponse), null);
+                        upload.maybeSendDeferredFiles(id);
+                        connectionManager.free(id);
+                    });
+                } else {
+                    return upload.maybeSendDeferredFiles(id);
+                }
+                return false;
+            },
+            maybeSendDeferredFiles: function(id) {
+                var idsInGroup = options.getIdsInProxyGroup(id), uploadedThisId = false;
+                if (idsInGroup && idsInGroup.length) {
+                    log("Maybe ready to upload proxy group file " + id);
+                    qq.each(idsInGroup, function(idx, idInGroup) {
+                        if (upload.isDeferredEligibleForUpload(idInGroup) && !!handler.getFile(idInGroup)) {
+                            uploadedThisId = idInGroup === id;
+                            upload.now(idInGroup);
+                        } else if (upload.isDeferredEligibleForUpload(idInGroup)) {
+                            return false;
+                        }
+                    });
+                } else {
+                    uploadedThisId = true;
+                    upload.now(id);
+                }
+                return uploadedThisId;
+            },
+            maybeNewUuid: function(id, response) {
+                if (response.newUuid !== undefined) {
+                    options.onUuidChanged(id, response.newUuid);
+                }
+            },
+            normalizeResponse: function(originalResponse, successful) {
+                var response = originalResponse;
+                if (!qq.isObject(originalResponse)) {
+                    response = {};
+                    if (qq.isString(originalResponse) && !successful) {
+                        response.error = originalResponse;
+                    }
+                }
+                response.success = successful;
+                return response;
+            },
+            now: function(id) {
+                var name = options.getName(id);
+                if (!controller.isValid(id)) {
+                    throw new qq.Error(id + " is not a valid file ID to upload!");
+                }
+                options.onUpload(id, name);
+                if (chunkingPossible && handler._shouldChunkThisFile(id)) {
+                    chunked.sendNext(id);
+                } else {
+                    simple.send(id, name);
+                }
+            },
+            start: function(id) {
+                var blobToUpload = upload.getProxyOrBlob(id);
+                if (blobToUpload) {
+                    return upload.maybeDefer(id, blobToUpload);
+                } else {
+                    upload.now(id);
+                    return true;
+                }
+            }
+        };
+        qq.extend(this, {
+            add: function(id, file) {
+                handler.add.apply(this, arguments);
+            },
+            upload: function(id) {
+                if (connectionManager.open(id)) {
+                    return upload.start(id);
+                }
+                return false;
+            },
+            retry: function(id) {
+                if (concurrentChunkingPossible) {
+                    handler._getFileState(id).temp.ignoreFailure = false;
+                }
+                if (connectionManager.isUsingConnection(id)) {
+                    return upload.start(id);
+                } else {
+                    return controller.upload(id);
+                }
+            },
+            cancel: function(id) {
+                var cancelRetVal = handler.cancel(id);
+                if (qq.isGenericPromise(cancelRetVal)) {
+                    cancelRetVal.then(function() {
+                        upload.cancel(id);
+                    });
+                } else if (cancelRetVal !== false) {
+                    upload.cancel(id);
+                }
+            },
+            cancelAll: function() {
+                var waitingOrConnected = connectionManager.getWaitingOrConnected(), i;
+                if (waitingOrConnected.length) {
+                    for (i = waitingOrConnected.length - 1; i >= 0; i--) {
+                        controller.cancel(waitingOrConnected[i]);
+                    }
+                }
+                connectionManager.reset();
+            },
+            getFile: function(id) {
+                if (handler.getProxy && handler.getProxy(id)) {
+                    return handler.getProxy(id).referenceBlob;
+                }
+                return handler.getFile && handler.getFile(id);
+            },
+            isProxied: function(id) {
+                return !!(handler.getProxy && handler.getProxy(id));
+            },
+            getInput: function(id) {
+                if (handler.getInput) {
+                    return handler.getInput(id);
+                }
+            },
+            reset: function() {
+                log("Resetting upload handler");
+                controller.cancelAll();
+                connectionManager.reset();
+                handler.reset();
+            },
+            expunge: function(id) {
+                if (controller.isValid(id)) {
+                    return handler.expunge(id);
+                }
+            },
+            isValid: function(id) {
+                return handler.isValid(id);
+            },
+            getResumableFilesData: function() {
+                if (handler.getResumableFilesData) {
+                    return handler.getResumableFilesData();
+                }
+                return [];
+            },
+            getThirdPartyFileId: function(id) {
+                if (controller.isValid(id)) {
+                    return handler.getThirdPartyFileId(id);
+                }
+            },
+            pause: function(id) {
+                if (controller.isResumable(id) && handler.pause && controller.isValid(id) && handler.pause(id)) {
+                    connectionManager.free(id);
+                    handler.moveInProgressToRemaining(id);
+                    return true;
+                }
+                return false;
+            },
+            isResumable: function(id) {
+                return !!handler.isResumable && handler.isResumable(id);
+            }
+        });
+        qq.extend(options, o);
+        log = options.log;
+        chunkingPossible = options.chunking.enabled && qq.supportedFeatures.chunking;
+        concurrentChunkingPossible = chunkingPossible && options.chunking.concurrent.enabled;
+        preventRetryResponse = function() {
+            var response = {};
+            response[options.preventRetryParam] = true;
+            return response;
+        }();
+        upload.initHandler();
+    };
+    qq.WindowReceiveMessage = function(o) {
+        "use strict";
+        var options = {
+            log: function(message, level) {}
+        }, callbackWrapperDetachers = {};
+        qq.extend(options, o);
+        qq.extend(this, {
+            receiveMessage: function(id, callback) {
+                var onMessageCallbackWrapper = function(event) {
+                    callback(event.data);
+                };
+                if (window.postMessage) {
+                    callbackWrapperDetachers[id] = qq(window).attach("message", onMessageCallbackWrapper);
+                } else {
+                    log("iframe message passing not supported in this browser!", "error");
+                }
+            },
+            stopReceivingMessages: function(id) {
+                if (window.postMessage) {
+                    var detacher = callbackWrapperDetachers[id];
+                    if (detacher) {
+                        detacher();
+                    }
+                }
+            }
+        });
+    };
+    qq.FormUploadHandler = function(spec) {
+        "use strict";
+        var options = spec.options, handler = this, proxy = spec.proxy, formHandlerInstanceId = qq.getUniqueId(), onloadCallbacks = {}, detachLoadEvents = {}, postMessageCallbackTimers = {}, isCors = options.isCors, inputName = options.inputName, getUuid = proxy.getUuid, log = proxy.log, corsMessageReceiver = new qq.WindowReceiveMessage({
+            log: log
+        });
+        function expungeFile(id) {
+            delete detachLoadEvents[id];
+            if (isCors) {
+                clearTimeout(postMessageCallbackTimers[id]);
+                delete postMessageCallbackTimers[id];
+                corsMessageReceiver.stopReceivingMessages(id);
+            }
+            var iframe = document.getElementById(handler._getIframeName(id));
+            if (iframe) {
+                iframe.setAttribute("src", "javascript:false;");
+                qq(iframe).remove();
+            }
+        }
+        function getFileIdForIframeName(iframeName) {
+            return iframeName.split("_")[0];
+        }
+        function initIframeForUpload(name) {
+            var iframe = qq.toElement("<iframe src='javascript:false;' name='" + name + "' />");
+            iframe.setAttribute("id", name);
+            iframe.style.display = "none";
+            document.body.appendChild(iframe);
+            return iframe;
+        }
+        function registerPostMessageCallback(iframe, callback) {
+            var iframeName = iframe.id, fileId = getFileIdForIframeName(iframeName), uuid = getUuid(fileId);
+            onloadCallbacks[uuid] = callback;
+            detachLoadEvents[fileId] = qq(iframe).attach("load", function() {
+                if (handler.getInput(fileId)) {
+                    log("Received iframe load event for CORS upload request (iframe name " + iframeName + ")");
+                    postMessageCallbackTimers[iframeName] = setTimeout(function() {
+                        var errorMessage = "No valid message received from loaded iframe for iframe name " + iframeName;
+                        log(errorMessage, "error");
+                        callback({
+                            error: errorMessage
+                        });
+                    }, 1e3);
+                }
+            });
+            corsMessageReceiver.receiveMessage(iframeName, function(message) {
+                log("Received the following window message: '" + message + "'");
+                var fileId = getFileIdForIframeName(iframeName), response = handler._parseJsonResponse(message), uuid = response.uuid, onloadCallback;
+                if (uuid && onloadCallbacks[uuid]) {
+                    log("Handling response for iframe name " + iframeName);
+                    clearTimeout(postMessageCallbackTimers[iframeName]);
+                    delete postMessageCallbackTimers[iframeName];
+                    handler._detachLoadEvent(iframeName);
+                    onloadCallback = onloadCallbacks[uuid];
+                    delete onloadCallbacks[uuid];
+                    corsMessageReceiver.stopReceivingMessages(iframeName);
+                    onloadCallback(response);
+                } else if (!uuid) {
+                    log("'" + message + "' does not contain a UUID - ignoring.");
+                }
+            });
+        }
+        qq.extend(this, new qq.UploadHandler(spec));
+        qq.override(this, function(super_) {
+            return {
+                add: function(id, fileInput) {
+                    super_.add(id, {
+                        input: fileInput
+                    });
+                    fileInput.setAttribute("name", inputName);
+                    if (fileInput.parentNode) {
+                        qq(fileInput).remove();
+                    }
+                },
+                expunge: function(id) {
+                    expungeFile(id);
+                    super_.expunge(id);
+                },
+                isValid: function(id) {
+                    return super_.isValid(id) && handler._getFileState(id).input !== undefined;
+                }
+            };
+        });
+        qq.extend(this, {
+            getInput: function(id) {
+                return handler._getFileState(id).input;
+            },
+            _attachLoadEvent: function(iframe, callback) {
+                var responseDescriptor;
+                if (isCors) {
+                    registerPostMessageCallback(iframe, callback);
+                } else {
+                    detachLoadEvents[iframe.id] = qq(iframe).attach("load", function() {
+                        log("Received response for " + iframe.id);
+                        if (!iframe.parentNode) {
+                            return;
+                        }
+                        try {
+                            if (iframe.contentDocument && iframe.contentDocument.body && iframe.contentDocument.body.innerHTML == "false") {
+                                return;
+                            }
+                        } catch (error) {
+                            log("Error when attempting to access iframe during handling of upload response (" + error.message + ")", "error");
+                            responseDescriptor = {
+                                success: false
+                            };
+                        }
+                        callback(responseDescriptor);
+                    });
+                }
+            },
+            _createIframe: function(id) {
+                var iframeName = handler._getIframeName(id);
+                return initIframeForUpload(iframeName);
+            },
+            _detachLoadEvent: function(id) {
+                if (detachLoadEvents[id] !== undefined) {
+                    detachLoadEvents[id]();
+                    delete detachLoadEvents[id];
+                }
+            },
+            _getIframeName: function(fileId) {
+                return fileId + "_" + formHandlerInstanceId;
+            },
+            _initFormForUpload: function(spec) {
+                var method = spec.method, endpoint = spec.endpoint, params = spec.params, paramsInBody = spec.paramsInBody, targetName = spec.targetName, form = qq.toElement("<form method='" + method + "' enctype='multipart/form-data'></form>"), url = endpoint;
+                if (paramsInBody) {
+                    qq.obj2Inputs(params, form);
+                } else {
+                    url = qq.obj2url(params, endpoint);
+                }
+                form.setAttribute("action", url);
+                form.setAttribute("target", targetName);
+                form.style.display = "none";
+                document.body.appendChild(form);
+                return form;
+            },
+            _parseJsonResponse: function(innerHtmlOrMessage) {
+                var response = {};
+                try {
+                    response = qq.parseJson(innerHtmlOrMessage);
+                } catch (error) {
+                    log("Error when attempting to parse iframe upload response (" + error.message + ")", "error");
+                }
+                return response;
+            }
+        });
+    };
+    qq.XhrUploadHandler = function(spec) {
+        "use strict";
+        var handler = this, namespace = spec.options.namespace, proxy = spec.proxy, chunking = spec.options.chunking, resume = spec.options.resume, chunkFiles = chunking && spec.options.chunking.enabled && qq.supportedFeatures.chunking, resumeEnabled = resume && spec.options.resume.enabled && chunkFiles && qq.supportedFeatures.resume, getName = proxy.getName, getSize = proxy.getSize, getUuid = proxy.getUuid, getEndpoint = proxy.getEndpoint, getDataByUuid = proxy.getDataByUuid, onUuidChanged = proxy.onUuidChanged, onProgress = proxy.onProgress, log = proxy.log;
+        function abort(id) {
+            qq.each(handler._getXhrs(id), function(xhrId, xhr) {
+                var ajaxRequester = handler._getAjaxRequester(id, xhrId);
+                xhr.onreadystatechange = null;
+                xhr.upload.onprogress = null;
+                xhr.abort();
+                ajaxRequester && ajaxRequester.canceled && ajaxRequester.canceled(id);
+            });
+        }
+        qq.extend(this, new qq.UploadHandler(spec));
+        qq.override(this, function(super_) {
+            return {
+                add: function(id, blobOrProxy) {
+                    if (qq.isFile(blobOrProxy) || qq.isBlob(blobOrProxy)) {
+                        super_.add(id, {
+                            file: blobOrProxy
+                        });
+                    } else if (blobOrProxy instanceof qq.BlobProxy) {
+                        super_.add(id, {
+                            proxy: blobOrProxy
+                        });
+                    } else {
+                        throw new Error("Passed obj is not a File, Blob, or proxy");
+                    }
+                    handler._initTempState(id);
+                    resumeEnabled && handler._maybePrepareForResume(id);
+                },
+                expunge: function(id) {
+                    abort(id);
+                    handler._maybeDeletePersistedChunkData(id);
+                    handler._clearXhrs(id);
+                    super_.expunge(id);
+                }
+            };
+        });
+        qq.extend(this, {
+            clearCachedChunk: function(id, chunkIdx) {
+                delete handler._getFileState(id).temp.cachedChunks[chunkIdx];
+            },
+            clearXhr: function(id, chunkIdx) {
+                var tempState = handler._getFileState(id).temp;
+                if (tempState.xhrs) {
+                    delete tempState.xhrs[chunkIdx];
+                }
+                if (tempState.ajaxRequesters) {
+                    delete tempState.ajaxRequesters[chunkIdx];
+                }
+            },
+            finalizeChunks: function(id, responseParser) {
+                var lastChunkIdx = handler._getTotalChunks(id) - 1, xhr = handler._getXhr(id, lastChunkIdx);
+                if (responseParser) {
+                    return new qq.Promise().success(responseParser(xhr), xhr);
+                }
+                return new qq.Promise().success({}, xhr);
+            },
+            getFile: function(id) {
+                return handler.isValid(id) && handler._getFileState(id).file;
+            },
+            getProxy: function(id) {
+                return handler.isValid(id) && handler._getFileState(id).proxy;
+            },
+            getResumableFilesData: function() {
+                var resumableFilesData = [];
+                handler._iterateResumeRecords(function(key, uploadData) {
+                    handler.moveInProgressToRemaining(null, uploadData.chunking.inProgress, uploadData.chunking.remaining);
+                    var data = {
+                        name: uploadData.name,
+                        remaining: uploadData.chunking.remaining,
+                        size: uploadData.size,
+                        uuid: uploadData.uuid
+                    };
+                    if (uploadData.key) {
+                        data.key = uploadData.key;
+                    }
+                    resumableFilesData.push(data);
+                });
+                return resumableFilesData;
+            },
+            isResumable: function(id) {
+                return !!chunking && handler.isValid(id) && !handler._getFileState(id).notResumable;
+            },
+            moveInProgressToRemaining: function(id, optInProgress, optRemaining) {
+                var inProgress = optInProgress || handler._getFileState(id).chunking.inProgress, remaining = optRemaining || handler._getFileState(id).chunking.remaining;
+                if (inProgress) {
+                    log(qq.format("Moving these chunks from in-progress {}, to remaining.", JSON.stringify(inProgress)));
+                    inProgress.reverse();
+                    qq.each(inProgress, function(idx, chunkIdx) {
+                        remaining.unshift(chunkIdx);
+                    });
+                    inProgress.length = 0;
+                }
+            },
+            pause: function(id) {
+                if (handler.isValid(id)) {
+                    log(qq.format("Aborting XHR upload for {} '{}' due to pause instruction.", id, getName(id)));
+                    handler._getFileState(id).paused = true;
+                    abort(id);
+                    return true;
+                }
+            },
+            reevaluateChunking: function(id) {
+                if (chunking && handler.isValid(id)) {
+                    var state = handler._getFileState(id), totalChunks, i;
+                    delete state.chunking;
+                    state.chunking = {};
+                    totalChunks = handler._getTotalChunks(id);
+                    if (totalChunks > 1 || chunking.mandatory) {
+                        state.chunking.enabled = true;
+                        state.chunking.parts = totalChunks;
+                        state.chunking.remaining = [];
+                        for (i = 0; i < totalChunks; i++) {
+                            state.chunking.remaining.push(i);
+                        }
+                        handler._initTempState(id);
+                    } else {
+                        state.chunking.enabled = false;
+                    }
+                }
+            },
+            updateBlob: function(id, newBlob) {
+                if (handler.isValid(id)) {
+                    handler._getFileState(id).file = newBlob;
+                }
+            },
+            _clearXhrs: function(id) {
+                var tempState = handler._getFileState(id).temp;
+                qq.each(tempState.ajaxRequesters, function(chunkId) {
+                    delete tempState.ajaxRequesters[chunkId];
+                });
+                qq.each(tempState.xhrs, function(chunkId) {
+                    delete tempState.xhrs[chunkId];
+                });
+            },
+            _createXhr: function(id, optChunkIdx) {
+                return handler._registerXhr(id, optChunkIdx, qq.createXhrInstance());
+            },
+            _getAjaxRequester: function(id, optChunkIdx) {
+                var chunkIdx = optChunkIdx == null ? -1 : optChunkIdx;
+                return handler._getFileState(id).temp.ajaxRequesters[chunkIdx];
+            },
+            _getChunkData: function(id, chunkIndex) {
+                var chunkSize = chunking.partSize, fileSize = getSize(id), fileOrBlob = handler.getFile(id), startBytes = chunkSize * chunkIndex, endBytes = startBytes + chunkSize >= fileSize ? fileSize : startBytes + chunkSize, totalChunks = handler._getTotalChunks(id), cachedChunks = this._getFileState(id).temp.cachedChunks, blob = cachedChunks[chunkIndex] || qq.sliceBlob(fileOrBlob, startBytes, endBytes);
+                cachedChunks[chunkIndex] = blob;
+                return {
+                    part: chunkIndex,
+                    start: startBytes,
+                    end: endBytes,
+                    count: totalChunks,
+                    blob: blob,
+                    size: endBytes - startBytes
+                };
+            },
+            _getChunkDataForCallback: function(chunkData) {
+                return {
+                    partIndex: chunkData.part,
+                    startByte: chunkData.start + 1,
+                    endByte: chunkData.end,
+                    totalParts: chunkData.count
+                };
+            },
+            _getLocalStorageId: function(id) {
+                var formatVersion = "5.0", name = getName(id), size = getSize(id), chunkSize = chunking.partSize, endpoint = getEndpoint(id);
+                return qq.format("qq{}resume{}-{}-{}-{}-{}", namespace, formatVersion, name, size, chunkSize, endpoint);
+            },
+            _getMimeType: function(id) {
+                return handler.getFile(id).type;
+            },
+            _getPersistableData: function(id) {
+                return handler._getFileState(id).chunking;
+            },
+            _getTotalChunks: function(id) {
+                if (chunking) {
+                    var fileSize = getSize(id), chunkSize = chunking.partSize;
+                    return Math.ceil(fileSize / chunkSize);
+                }
+            },
+            _getXhr: function(id, optChunkIdx) {
+                var chunkIdx = optChunkIdx == null ? -1 : optChunkIdx;
+                return handler._getFileState(id).temp.xhrs[chunkIdx];
+            },
+            _getXhrs: function(id) {
+                return handler._getFileState(id).temp.xhrs;
+            },
+            _iterateResumeRecords: function(callback) {
+                if (resumeEnabled) {
+                    qq.each(localStorage, function(key, item) {
+                        if (key.indexOf(qq.format("qq{}resume", namespace)) === 0) {
+                            var uploadData = JSON.parse(item);
+                            callback(key, uploadData);
+                        }
+                    });
+                }
+            },
+            _initTempState: function(id) {
+                handler._getFileState(id).temp = {
+                    ajaxRequesters: {},
+                    chunkProgress: {},
+                    xhrs: {},
+                    cachedChunks: {}
+                };
+            },
+            _markNotResumable: function(id) {
+                handler._getFileState(id).notResumable = true;
+            },
+            _maybeDeletePersistedChunkData: function(id) {
+                var localStorageId;
+                if (resumeEnabled && handler.isResumable(id)) {
+                    localStorageId = handler._getLocalStorageId(id);
+                    if (localStorageId && localStorage.getItem(localStorageId)) {
+                        localStorage.removeItem(localStorageId);
+                        return true;
+                    }
+                }
+                return false;
+            },
+            _maybePrepareForResume: function(id) {
+                var state = handler._getFileState(id), localStorageId, persistedData;
+                if (resumeEnabled && state.key === undefined) {
+                    localStorageId = handler._getLocalStorageId(id);
+                    persistedData = localStorage.getItem(localStorageId);
+                    if (persistedData) {
+                        persistedData = JSON.parse(persistedData);
+                        if (getDataByUuid(persistedData.uuid)) {
+                            handler._markNotResumable(id);
+                        } else {
+                            log(qq.format("Identified file with ID {} and name of {} as resumable.", id, getName(id)));
+                            onUuidChanged(id, persistedData.uuid);
+                            state.key = persistedData.key;
+                            state.chunking = persistedData.chunking;
+                            state.loaded = persistedData.loaded;
+                            state.attemptingResume = true;
+                            handler.moveInProgressToRemaining(id);
+                        }
+                    }
+                }
+            },
+            _maybePersistChunkedState: function(id) {
+                var state = handler._getFileState(id), localStorageId, persistedData;
+                if (resumeEnabled && handler.isResumable(id)) {
+                    localStorageId = handler._getLocalStorageId(id);
+                    persistedData = {
+                        name: getName(id),
+                        size: getSize(id),
+                        uuid: getUuid(id),
+                        key: state.key,
+                        chunking: state.chunking,
+                        loaded: state.loaded,
+                        lastUpdated: Date.now()
+                    };
+                    try {
+                        localStorage.setItem(localStorageId, JSON.stringify(persistedData));
+                    } catch (error) {
+                        log(qq.format("Unable to save resume data for '{}' due to error: '{}'.", id, error.toString()), "warn");
+                    }
+                }
+            },
+            _registerProgressHandler: function(id, chunkIdx, chunkSize) {
+                var xhr = handler._getXhr(id, chunkIdx), name = getName(id), progressCalculator = {
+                    simple: function(loaded, total) {
+                        var fileSize = getSize(id);
+                        if (loaded === total) {
+                            onProgress(id, name, fileSize, fileSize);
+                        } else {
+                            onProgress(id, name, loaded >= fileSize ? fileSize - 1 : loaded, fileSize);
+                        }
+                    },
+                    chunked: function(loaded, total) {
+                        var chunkProgress = handler._getFileState(id).temp.chunkProgress, totalSuccessfullyLoadedForFile = handler._getFileState(id).loaded, loadedForRequest = loaded, totalForRequest = total, totalFileSize = getSize(id), estActualChunkLoaded = loadedForRequest - (totalForRequest - chunkSize), totalLoadedForFile = totalSuccessfullyLoadedForFile;
+                        chunkProgress[chunkIdx] = estActualChunkLoaded;
+                        qq.each(chunkProgress, function(chunkIdx, chunkLoaded) {
+                            totalLoadedForFile += chunkLoaded;
+                        });
+                        onProgress(id, name, totalLoadedForFile, totalFileSize);
+                    }
+                };
+                xhr.upload.onprogress = function(e) {
+                    if (e.lengthComputable) {
+                        var type = chunkSize == null ? "simple" : "chunked";
+                        progressCalculator[type](e.loaded, e.total);
+                    }
+                };
+            },
+            _registerXhr: function(id, optChunkIdx, xhr, optAjaxRequester) {
+                var xhrsId = optChunkIdx == null ? -1 : optChunkIdx, tempState = handler._getFileState(id).temp;
+                tempState.xhrs = tempState.xhrs || {};
+                tempState.ajaxRequesters = tempState.ajaxRequesters || {};
+                tempState.xhrs[xhrsId] = xhr;
+                if (optAjaxRequester) {
+                    tempState.ajaxRequesters[xhrsId] = optAjaxRequester;
+                }
+                return xhr;
+            },
+            _removeExpiredChunkingRecords: function() {
+                var expirationDays = resume.recordsExpireIn;
+                handler._iterateResumeRecords(function(key, uploadData) {
+                    var expirationDate = new Date(uploadData.lastUpdated);
+                    expirationDate.setDate(expirationDate.getDate() + expirationDays);
+                    if (expirationDate.getTime() <= Date.now()) {
+                        log("Removing expired resume record with key " + key);
+                        localStorage.removeItem(key);
+                    }
+                });
+            },
+            _shouldChunkThisFile: function(id) {
+                var state = handler._getFileState(id);
+                if (!state.chunking) {
+                    handler.reevaluateChunking(id);
+                }
+                return state.chunking.enabled;
+            }
+        });
+    };
+    qq.DeleteFileAjaxRequester = function(o) {
+        "use strict";
+        var requester, options = {
+            method: "DELETE",
+            uuidParamName: "qquuid",
+            endpointStore: {},
+            maxConnections: 3,
+            customHeaders: function(id) {
+                return {};
+            },
+            paramsStore: {},
+            cors: {
+                expected: false,
+                sendCredentials: false
+            },
+            log: function(str, level) {},
+            onDelete: function(id) {},
+            onDeleteComplete: function(id, xhrOrXdr, isError) {}
+        };
+        qq.extend(options, o);
+        function getMandatedParams() {
+            if (options.method.toUpperCase() === "POST") {
+                return {
+                    _method: "DELETE"
+                };
+            }
+            return {};
+        }
+        requester = qq.extend(this, new qq.AjaxRequester({
+            acceptHeader: "application/json",
+            validMethods: [ "POST", "DELETE" ],
+            method: options.method,
+            endpointStore: options.endpointStore,
+            paramsStore: options.paramsStore,
+            mandatedParams: getMandatedParams(),
+            maxConnections: options.maxConnections,
+            customHeaders: function(id) {
+                return options.customHeaders.get(id);
+            },
+            log: options.log,
+            onSend: options.onDelete,
+            onComplete: options.onDeleteComplete,
+            cors: options.cors
+        }));
+        qq.extend(this, {
+            sendDelete: function(id, uuid, additionalMandatedParams) {
+                var additionalOptions = additionalMandatedParams || {};
+                options.log("Submitting delete file request for " + id);
+                if (options.method === "DELETE") {
+                    requester.initTransport(id).withPath(uuid).withParams(additionalOptions).send();
+                } else {
+                    additionalOptions[options.uuidParamName] = uuid;
+                    requester.initTransport(id).withParams(additionalOptions).send();
+                }
+            }
+        });
+    };
+    (function() {
+        function detectSubsampling(img) {
+            var iw = img.naturalWidth, ih = img.naturalHeight, canvas = document.createElement("canvas"), ctx;
+            if (iw * ih > 1024 * 1024) {
+                canvas.width = canvas.height = 1;
+                ctx = canvas.getContext("2d");
+                ctx.drawImage(img, -iw + 1, 0);
+                return ctx.getImageData(0, 0, 1, 1).data[3] === 0;
+            } else {
+                return false;
+            }
+        }
+        function detectVerticalSquash(img, iw, ih) {
+            var canvas = document.createElement("canvas"), sy = 0, ey = ih, py = ih, ctx, data, alpha, ratio;
+            canvas.width = 1;
+            canvas.height = ih;
+            ctx = canvas.getContext("2d");
+            ctx.drawImage(img, 0, 0);
+            data = ctx.getImageData(0, 0, 1, ih).data;
+            while (py > sy) {
+                alpha = data[(py - 1) * 4 + 3];
+                if (alpha === 0) {
+                    ey = py;
+                } else {
+                    sy = py;
+                }
+                py = ey + sy >> 1;
+            }
+            ratio = py / ih;
+            return ratio === 0 ? 1 : ratio;
+        }
+        function renderImageToDataURL(img, blob, options, doSquash) {
+            var canvas = document.createElement("canvas"), mime = options.mime || "image/jpeg", promise = new qq.Promise();
+            renderImageToCanvas(img, blob, canvas, options, doSquash).then(function() {
+                promise.success(canvas.toDataURL(mime, options.quality || .8));
+            });
+            return promise;
+        }
+        function maybeCalculateDownsampledDimensions(spec) {
+            var maxPixels = 5241e3;
+            if (!qq.ios()) {
+                throw new qq.Error("Downsampled dimensions can only be reliably calculated for iOS!");
+            }
+            if (spec.origHeight * spec.origWidth > maxPixels) {
+                return {
+                    newHeight: Math.round(Math.sqrt(maxPixels * (spec.origHeight / spec.origWidth))),
+                    newWidth: Math.round(Math.sqrt(maxPixels * (spec.origWidth / spec.origHeight)))
+                };
+            }
+        }
+        function renderImageToCanvas(img, blob, canvas, options, doSquash) {
+            var iw = img.naturalWidth, ih = img.naturalHeight, width = options.width, height = options.height, ctx = canvas.getContext("2d"), promise = new qq.Promise(), modifiedDimensions;
+            ctx.save();
+            if (options.resize) {
+                return renderImageToCanvasWithCustomResizer({
+                    blob: blob,
+                    canvas: canvas,
+                    image: img,
+                    imageHeight: ih,
+                    imageWidth: iw,
+                    orientation: options.orientation,
+                    resize: options.resize,
+                    targetHeight: height,
+                    targetWidth: width
+                });
+            }
+            if (!qq.supportedFeatures.unlimitedScaledImageSize) {
+                modifiedDimensions = maybeCalculateDownsampledDimensions({
+                    origWidth: width,
+                    origHeight: height
+                });
+                if (modifiedDimensions) {
+                    qq.log(qq.format("Had to reduce dimensions due to device limitations from {}w / {}h to {}w / {}h", width, height, modifiedDimensions.newWidth, modifiedDimensions.newHeight), "warn");
+                    width = modifiedDimensions.newWidth;
+                    height = modifiedDimensions.newHeight;
+                }
+            }
+            transformCoordinate(canvas, width, height, options.orientation);
+            if (qq.ios()) {
+                (function() {
+                    if (detectSubsampling(img)) {
+                        iw /= 2;
+                        ih /= 2;
+                    }
+                    var d = 1024, tmpCanvas = document.createElement("canvas"), vertSquashRatio = doSquash ? detectVerticalSquash(img, iw, ih) : 1, dw = Math.ceil(d * width / iw), dh = Math.ceil(d * height / ih / vertSquashRatio), sy = 0, dy = 0, tmpCtx, sx, dx;
+                    tmpCanvas.width = tmpCanvas.height = d;
+                    tmpCtx = tmpCanvas.getContext("2d");
+                    while (sy < ih) {
+                        sx = 0;
+                        dx = 0;
+                        while (sx < iw) {
+                            tmpCtx.clearRect(0, 0, d, d);
+                            tmpCtx.drawImage(img, -sx, -sy);
+                            ctx.drawImage(tmpCanvas, 0, 0, d, d, dx, dy, dw, dh);
+                            sx += d;
+                            dx += dw;
+                        }
+                        sy += d;
+                        dy += dh;
+                    }
+                    ctx.restore();
+                    tmpCanvas = tmpCtx = null;
+                })();
+            } else {
+                ctx.drawImage(img, 0, 0, width, height);
+            }
+            canvas.qqImageRendered && canvas.qqImageRendered();
+            promise.success();
+            return promise;
+        }
+        function renderImageToCanvasWithCustomResizer(resizeInfo) {
+            var blob = resizeInfo.blob, image = resizeInfo.image, imageHeight = resizeInfo.imageHeight, imageWidth = resizeInfo.imageWidth, orientation = resizeInfo.orientation, promise = new qq.Promise(), resize = resizeInfo.resize, sourceCanvas = document.createElement("canvas"), sourceCanvasContext = sourceCanvas.getContext("2d"), targetCanvas = resizeInfo.canvas, targetHeight = resizeInfo.targetHeight, targetWidth = resizeInfo.targetWidth;
+            transformCoordinate(sourceCanvas, imageWidth, imageHeight, orientation);
+            targetCanvas.height = targetHeight;
+            targetCanvas.width = targetWidth;
+            sourceCanvasContext.drawImage(image, 0, 0);
+            resize({
+                blob: blob,
+                height: targetHeight,
+                image: image,
+                sourceCanvas: sourceCanvas,
+                targetCanvas: targetCanvas,
+                width: targetWidth
+            }).then(function success() {
+                targetCanvas.qqImageRendered && targetCanvas.qqImageRendered();
+                promise.success();
+            }, promise.failure);
+            return promise;
+        }
+        function transformCoordinate(canvas, width, height, orientation) {
+            switch (orientation) {
+              case 5:
+              case 6:
+              case 7:
+              case 8:
+                canvas.width = height;
+                canvas.height = width;
+                break;
+
+              default:
+                canvas.width = width;
+                canvas.height = height;
+            }
+            var ctx = canvas.getContext("2d");
+            switch (orientation) {
+              case 2:
+                ctx.translate(width, 0);
+                ctx.scale(-1, 1);
+                break;
+
+              case 3:
+                ctx.translate(width, height);
+                ctx.rotate(Math.PI);
+                break;
+
+              case 4:
+                ctx.translate(0, height);
+                ctx.scale(1, -1);
+                break;
+
+              case 5:
+                ctx.rotate(.5 * Math.PI);
+                ctx.scale(1, -1);
+                break;
+
+              case 6:
+                ctx.rotate(.5 * Math.PI);
+                ctx.translate(0, -height);
+                break;
+
+              case 7:
+                ctx.rotate(.5 * Math.PI);
+                ctx.translate(width, -height);
+                ctx.scale(-1, 1);
+                break;
+
+              case 8:
+                ctx.rotate(-.5 * Math.PI);
+                ctx.translate(-width, 0);
+                break;
+
+              default:
+                break;
+            }
+        }
+        function MegaPixImage(srcImage, errorCallback) {
+            var self = this;
+            if (window.Blob && srcImage instanceof Blob) {
+                (function() {
+                    var img = new Image(), URL = window.URL && window.URL.createObjectURL ? window.URL : window.webkitURL && window.webkitURL.createObjectURL ? window.webkitURL : null;
+                    if (!URL) {
+                        throw Error("No createObjectURL function found to create blob url");
+                    }
+                    img.src = URL.createObjectURL(srcImage);
+                    self.blob = srcImage;
+                    srcImage = img;
+                })();
+            }
+            if (!srcImage.naturalWidth && !srcImage.naturalHeight) {
+                srcImage.onload = function() {
+                    var listeners = self.imageLoadListeners;
+                    if (listeners) {
+                        self.imageLoadListeners = null;
+                        setTimeout(function() {
+                            for (var i = 0, len = listeners.length; i < len; i++) {
+                                listeners[i]();
+                            }
+                        }, 0);
+                    }
+                };
+                srcImage.onerror = errorCallback;
+                this.imageLoadListeners = [];
+            }
+            this.srcImage = srcImage;
+        }
+        MegaPixImage.prototype.render = function(target, options) {
+            options = options || {};
+            var self = this, imgWidth = this.srcImage.naturalWidth, imgHeight = this.srcImage.naturalHeight, width = options.width, height = options.height, maxWidth = options.maxWidth, maxHeight = options.maxHeight, doSquash = !this.blob || this.blob.type === "image/jpeg", tagName = target.tagName.toLowerCase(), opt;
+            if (this.imageLoadListeners) {
+                this.imageLoadListeners.push(function() {
+                    self.render(target, options);
+                });
+                return;
+            }
+            if (width && !height) {
+                height = imgHeight * width / imgWidth << 0;
+            } else if (height && !width) {
+                width = imgWidth * height / imgHeight << 0;
+            } else {
+                width = imgWidth;
+                height = imgHeight;
+            }
+            if (maxWidth && width > maxWidth) {
+                width = maxWidth;
+                height = imgHeight * width / imgWidth << 0;
+            }
+            if (maxHeight && height > maxHeight) {
+                height = maxHeight;
+                width = imgWidth * height / imgHeight << 0;
+            }
+            opt = {
+                width: width,
+                height: height
+            }, qq.each(options, function(optionsKey, optionsValue) {
+                opt[optionsKey] = optionsValue;
+            });
+            if (tagName === "img") {
+                (function() {
+                    var oldTargetSrc = target.src;
+                    renderImageToDataURL(self.srcImage, self.blob, opt, doSquash).then(function(dataUri) {
+                        target.src = dataUri;
+                        oldTargetSrc === target.src && target.onload();
+                    });
+                })();
+            } else if (tagName === "canvas") {
+                renderImageToCanvas(this.srcImage, this.blob, target, opt, doSquash);
+            }
+            if (typeof this.onrender === "function") {
+                this.onrender(target);
+            }
+        };
+        qq.MegaPixImage = MegaPixImage;
+    })();
+    qq.ImageGenerator = function(log) {
+        "use strict";
+        function isImg(el) {
+            return el.tagName.toLowerCase() === "img";
+        }
+        function isCanvas(el) {
+            return el.tagName.toLowerCase() === "canvas";
+        }
+        function isImgCorsSupported() {
+            return new Image().crossOrigin !== undefined;
+        }
+        function isCanvasSupported() {
+            var canvas = document.createElement("canvas");
+            return canvas.getContext && canvas.getContext("2d");
+        }
+        function determineMimeOfFileName(nameWithPath) {
+            var pathSegments = nameWithPath.split("/"), name = pathSegments[pathSegments.length - 1].split("?")[0], extension = qq.getExtension(name);
+            extension = extension && extension.toLowerCase();
+            switch (extension) {
+              case "jpeg":
+              case "jpg":
+                return "image/jpeg";
+
+              case "png":
+                return "image/png";
+
+              case "bmp":
+                return "image/bmp";
+
+              case "gif":
+                return "image/gif";
+
+              case "tiff":
+              case "tif":
+                return "image/tiff";
+            }
+        }
+        function isCrossOrigin(url) {
+            var targetAnchor = document.createElement("a"), targetProtocol, targetHostname, targetPort;
+            targetAnchor.href = url;
+            targetProtocol = targetAnchor.protocol;
+            targetPort = targetAnchor.port;
+            targetHostname = targetAnchor.hostname;
+            if (targetProtocol.toLowerCase() !== window.location.protocol.toLowerCase()) {
+                return true;
+            }
+            if (targetHostname.toLowerCase() !== window.location.hostname.toLowerCase()) {
+                return true;
+            }
+            if (targetPort !== window.location.port && !qq.ie()) {
+                return true;
+            }
+            return false;
+        }
+        function registerImgLoadListeners(img, promise) {
+            img.onload = function() {
+                img.onload = null;
+                img.onerror = null;
+                promise.success(img);
+            };
+            img.onerror = function() {
+                img.onload = null;
+                img.onerror = null;
+                log("Problem drawing thumbnail!", "error");
+                promise.failure(img, "Problem drawing thumbnail!");
+            };
+        }
+        function registerCanvasDrawImageListener(canvas, promise) {
+            canvas.qqImageRendered = function() {
+                promise.success(canvas);
+            };
+        }
+        function registerThumbnailRenderedListener(imgOrCanvas, promise) {
+            var registered = isImg(imgOrCanvas) || isCanvas(imgOrCanvas);
+            if (isImg(imgOrCanvas)) {
+                registerImgLoadListeners(imgOrCanvas, promise);
+            } else if (isCanvas(imgOrCanvas)) {
+                registerCanvasDrawImageListener(imgOrCanvas, promise);
+            } else {
+                promise.failure(imgOrCanvas);
+                log(qq.format("Element container of type {} is not supported!", imgOrCanvas.tagName), "error");
+            }
+            return registered;
+        }
+        function draw(fileOrBlob, container, options) {
+            var drawPreview = new qq.Promise(), identifier = new qq.Identify(fileOrBlob, log), maxSize = options.maxSize, orient = options.orient == null ? true : options.orient, megapixErrorHandler = function() {
+                container.onerror = null;
+                container.onload = null;
+                log("Could not render preview, file may be too large!", "error");
+                drawPreview.failure(container, "Browser cannot render image!");
+            };
+            identifier.isPreviewable().then(function(mime) {
+                var dummyExif = {
+                    parse: function() {
+                        return new qq.Promise().success();
+                    }
+                }, exif = orient ? new qq.Exif(fileOrBlob, log) : dummyExif, mpImg = new qq.MegaPixImage(fileOrBlob, megapixErrorHandler);
+                if (registerThumbnailRenderedListener(container, drawPreview)) {
+                    exif.parse().then(function(exif) {
+                        var orientation = exif && exif.Orientation;
+                        mpImg.render(container, {
+                            maxWidth: maxSize,
+                            maxHeight: maxSize,
+                            orientation: orientation,
+                            mime: mime,
+                            resize: options.customResizeFunction
+                        });
+                    }, function(failureMsg) {
+                        log(qq.format("EXIF data could not be parsed ({}).  Assuming orientation = 1.", failureMsg));
+                        mpImg.render(container, {
+                            maxWidth: maxSize,
+                            maxHeight: maxSize,
+                            mime: mime,
+                            resize: options.customResizeFunction
+                        });
+                    });
+                }
+            }, function() {
+                log("Not previewable");
+                drawPreview.failure(container, "Not previewable");
+            });
+            return drawPreview;
+        }
+        function drawOnCanvasOrImgFromUrl(url, canvasOrImg, draw, maxSize, customResizeFunction) {
+            var tempImg = new Image(), tempImgRender = new qq.Promise();
+            registerThumbnailRenderedListener(tempImg, tempImgRender);
+            if (isCrossOrigin(url)) {
+                tempImg.crossOrigin = "anonymous";
+            }
+            tempImg.src = url;
+            tempImgRender.then(function rendered() {
+                registerThumbnailRenderedListener(canvasOrImg, draw);
+                var mpImg = new qq.MegaPixImage(tempImg);
+                mpImg.render(canvasOrImg, {
+                    maxWidth: maxSize,
+                    maxHeight: maxSize,
+                    mime: determineMimeOfFileName(url),
+                    resize: customResizeFunction
+                });
+            }, draw.failure);
+        }
+        function drawOnImgFromUrlWithCssScaling(url, img, draw, maxSize) {
+            registerThumbnailRenderedListener(img, draw);
+            qq(img).css({
+                maxWidth: maxSize + "px",
+                maxHeight: maxSize + "px"
+            });
+            img.src = url;
+        }
+        function drawFromUrl(url, container, options) {
+            var draw = new qq.Promise(), scale = options.scale, maxSize = scale ? options.maxSize : null;
+            if (scale && isImg(container)) {
+                if (isCanvasSupported()) {
+                    if (isCrossOrigin(url) && !isImgCorsSupported()) {
+                        drawOnImgFromUrlWithCssScaling(url, container, draw, maxSize);
+                    } else {
+                        drawOnCanvasOrImgFromUrl(url, container, draw, maxSize);
+                    }
+                } else {
+                    drawOnImgFromUrlWithCssScaling(url, container, draw, maxSize);
+                }
+            } else if (isCanvas(container)) {
+                drawOnCanvasOrImgFromUrl(url, container, draw, maxSize);
+            } else if (registerThumbnailRenderedListener(container, draw)) {
+                container.src = url;
+            }
+            return draw;
+        }
+        qq.extend(this, {
+            generate: function(fileBlobOrUrl, container, options) {
+                if (qq.isString(fileBlobOrUrl)) {
+                    log("Attempting to update thumbnail based on server response.");
+                    return drawFromUrl(fileBlobOrUrl, container, options || {});
+                } else {
+                    log("Attempting to draw client-side image preview.");
+                    return draw(fileBlobOrUrl, container, options || {});
+                }
+            }
+        });
+        this._testing = {};
+        this._testing.isImg = isImg;
+        this._testing.isCanvas = isCanvas;
+        this._testing.isCrossOrigin = isCrossOrigin;
+        this._testing.determineMimeOfFileName = determineMimeOfFileName;
+    };
+    qq.Exif = function(fileOrBlob, log) {
+        "use strict";
+        var TAG_IDS = [ 274 ], TAG_INFO = {
+            274: {
+                name: "Orientation",
+                bytes: 2
+            }
+        };
+        function parseLittleEndian(hex) {
+            var result = 0, pow = 0;
+            while (hex.length > 0) {
+                result += parseInt(hex.substring(0, 2), 16) * Math.pow(2, pow);
+                hex = hex.substring(2, hex.length);
+                pow += 8;
+            }
+            return result;
+        }
+        function seekToApp1(offset, promise) {
+            var theOffset = offset, thePromise = promise;
+            if (theOffset === undefined) {
+                theOffset = 2;
+                thePromise = new qq.Promise();
+            }
+            qq.readBlobToHex(fileOrBlob, theOffset, 4).then(function(hex) {
+                var match = /^ffe([0-9])/.exec(hex), segmentLength;
+                if (match) {
+                    if (match[1] !== "1") {
+                        segmentLength = parseInt(hex.slice(4, 8), 16);
+                        seekToApp1(theOffset + segmentLength + 2, thePromise);
+                    } else {
+                        thePromise.success(theOffset);
+                    }
+                } else {
+                    thePromise.failure("No EXIF header to be found!");
+                }
+            });
+            return thePromise;
+        }
+        function getApp1Offset() {
+            var promise = new qq.Promise();
+            qq.readBlobToHex(fileOrBlob, 0, 6).then(function(hex) {
+                if (hex.indexOf("ffd8") !== 0) {
+                    promise.failure("Not a valid JPEG!");
+                } else {
+                    seekToApp1().then(function(offset) {
+                        promise.success(offset);
+                    }, function(error) {
+                        promise.failure(error);
+                    });
+                }
+            });
+            return promise;
+        }
+        function isLittleEndian(app1Start) {
+            var promise = new qq.Promise();
+            qq.readBlobToHex(fileOrBlob, app1Start + 10, 2).then(function(hex) {
+                promise.success(hex === "4949");
+            });
+            return promise;
+        }
+        function getDirEntryCount(app1Start, littleEndian) {
+            var promise = new qq.Promise();
+            qq.readBlobToHex(fileOrBlob, app1Start + 18, 2).then(function(hex) {
+                if (littleEndian) {
+                    return promise.success(parseLittleEndian(hex));
+                } else {
+                    promise.success(parseInt(hex, 16));
+                }
+            });
+            return promise;
+        }
+        function getIfd(app1Start, dirEntries) {
+            var offset = app1Start + 20, bytes = dirEntries * 12;
+            return qq.readBlobToHex(fileOrBlob, offset, bytes);
+        }
+        function getDirEntries(ifdHex) {
+            var entries = [], offset = 0;
+            while (offset + 24 <= ifdHex.length) {
+                entries.push(ifdHex.slice(offset, offset + 24));
+                offset += 24;
+            }
+            return entries;
+        }
+        function getTagValues(littleEndian, dirEntries) {
+            var TAG_VAL_OFFSET = 16, tagsToFind = qq.extend([], TAG_IDS), vals = {};
+            qq.each(dirEntries, function(idx, entry) {
+                var idHex = entry.slice(0, 4), id = littleEndian ? parseLittleEndian(idHex) : parseInt(idHex, 16), tagsToFindIdx = tagsToFind.indexOf(id), tagValHex, tagName, tagValLength;
+                if (tagsToFindIdx >= 0) {
+                    tagName = TAG_INFO[id].name;
+                    tagValLength = TAG_INFO[id].bytes;
+                    tagValHex = entry.slice(TAG_VAL_OFFSET, TAG_VAL_OFFSET + tagValLength * 2);
+                    vals[tagName] = littleEndian ? parseLittleEndian(tagValHex) : parseInt(tagValHex, 16);
+                    tagsToFind.splice(tagsToFindIdx, 1);
+                }
+                if (tagsToFind.length === 0) {
+                    return false;
+                }
+            });
+            return vals;
+        }
+        qq.extend(this, {
+            parse: function() {
+                var parser = new qq.Promise(), onParseFailure = function(message) {
+                    log(qq.format("EXIF header parse failed: '{}' ", message));
+                    parser.failure(message);
+                };
+                getApp1Offset().then(function(app1Offset) {
+                    log(qq.format("Moving forward with EXIF header parsing for '{}'", fileOrBlob.name === undefined ? "blob" : fileOrBlob.name));
+                    isLittleEndian(app1Offset).then(function(littleEndian) {
+                        log(qq.format("EXIF Byte order is {} endian", littleEndian ? "little" : "big"));
+                        getDirEntryCount(app1Offset, littleEndian).then(function(dirEntryCount) {
+                            log(qq.format("Found {} APP1 directory entries", dirEntryCount));
+                            getIfd(app1Offset, dirEntryCount).then(function(ifdHex) {
+                                var dirEntries = getDirEntries(ifdHex), tagValues = getTagValues(littleEndian, dirEntries);
+                                log("Successfully parsed some EXIF tags");
+                                parser.success(tagValues);
+                            }, onParseFailure);
+                        }, onParseFailure);
+                    }, onParseFailure);
+                }, onParseFailure);
+                return parser;
+            }
+        });
+        this._testing = {};
+        this._testing.parseLittleEndian = parseLittleEndian;
+    };
+    qq.Identify = function(fileOrBlob, log) {
+        "use strict";
+        function isIdentifiable(magicBytes, questionableBytes) {
+            var identifiable = false, magicBytesEntries = [].concat(magicBytes);
+            qq.each(magicBytesEntries, function(idx, magicBytesArrayEntry) {
+                if (questionableBytes.indexOf(magicBytesArrayEntry) === 0) {
+                    identifiable = true;
+                    return false;
+                }
+            });
+            return identifiable;
+        }
+        qq.extend(this, {
+            isPreviewable: function() {
+                var self = this, identifier = new qq.Promise(), previewable = false, name = fileOrBlob.name === undefined ? "blob" : fileOrBlob.name;
+                log(qq.format("Attempting to determine if {} can be rendered in this browser", name));
+                log("First pass: check type attribute of blob object.");
+                if (this.isPreviewableSync()) {
+                    log("Second pass: check for magic bytes in file header.");
+                    qq.readBlobToHex(fileOrBlob, 0, 4).then(function(hex) {
+                        qq.each(self.PREVIEWABLE_MIME_TYPES, function(mime, bytes) {
+                            if (isIdentifiable(bytes, hex)) {
+                                if (mime !== "image/tiff" || qq.supportedFeatures.tiffPreviews) {
+                                    previewable = true;
+                                    identifier.success(mime);
+                                }
+                                return false;
+                            }
+                        });
+                        log(qq.format("'{}' is {} able to be rendered in this browser", name, previewable ? "" : "NOT"));
+                        if (!previewable) {
+                            identifier.failure();
+                        }
+                    }, function() {
+                        log("Error reading file w/ name '" + name + "'.  Not able to be rendered in this browser.");
+                        identifier.failure();
+                    });
+                } else {
+                    identifier.failure();
+                }
+                return identifier;
+            },
+            isPreviewableSync: function() {
+                var fileMime = fileOrBlob.type, isRecognizedImage = qq.indexOf(Object.keys(this.PREVIEWABLE_MIME_TYPES), fileMime) >= 0, previewable = false, name = fileOrBlob.name === undefined ? "blob" : fileOrBlob.name;
+                if (isRecognizedImage) {
+                    if (fileMime === "image/tiff") {
+                        previewable = qq.supportedFeatures.tiffPreviews;
+                    } else {
+                        previewable = true;
+                    }
+                }
+                !previewable && log(name + " is not previewable in this browser per the blob's type attr");
+                return previewable;
+            }
+        });
+    };
+    qq.Identify.prototype.PREVIEWABLE_MIME_TYPES = {
+        "image/jpeg": "ffd8ff",
+        "image/gif": "474946",
+        "image/png": "89504e",
+        "image/bmp": "424d",
+        "image/tiff": [ "49492a00", "4d4d002a" ]
+    };
+    qq.ImageValidation = function(blob, log) {
+        "use strict";
+        function hasNonZeroLimits(limits) {
+            var atLeastOne = false;
+            qq.each(limits, function(limit, value) {
+                if (value > 0) {
+                    atLeastOne = true;
+                    return false;
+                }
+            });
+            return atLeastOne;
+        }
+        function getWidthHeight() {
+            var sizeDetermination = new qq.Promise();
+            new qq.Identify(blob, log).isPreviewable().then(function() {
+                var image = new Image(), url = window.URL && window.URL.createObjectURL ? window.URL : window.webkitURL && window.webkitURL.createObjectURL ? window.webkitURL : null;
+                if (url) {
+                    image.onerror = function() {
+                        log("Cannot determine dimensions for image.  May be too large.", "error");
+                        sizeDetermination.failure();
+                    };
+                    image.onload = function() {
+                        sizeDetermination.success({
+                            width: this.width,
+                            height: this.height
+                        });
+                    };
+                    image.src = url.createObjectURL(blob);
+                } else {
+                    log("No createObjectURL function available to generate image URL!", "error");
+                    sizeDetermination.failure();
+                }
+            }, sizeDetermination.failure);
+            return sizeDetermination;
+        }
+        function getFailingLimit(limits, dimensions) {
+            var failingLimit;
+            qq.each(limits, function(limitName, limitValue) {
+                if (limitValue > 0) {
+                    var limitMatcher = /(max|min)(Width|Height)/.exec(limitName), dimensionPropName = limitMatcher[2].charAt(0).toLowerCase() + limitMatcher[2].slice(1), actualValue = dimensions[dimensionPropName];
+                    switch (limitMatcher[1]) {
+                      case "min":
+                        if (actualValue < limitValue) {
+                            failingLimit = limitName;
+                            return false;
+                        }
+                        break;
+
+                      case "max":
+                        if (actualValue > limitValue) {
+                            failingLimit = limitName;
+                            return false;
+                        }
+                        break;
+                    }
+                }
+            });
+            return failingLimit;
+        }
+        this.validate = function(limits) {
+            var validationEffort = new qq.Promise();
+            log("Attempting to validate image.");
+            if (hasNonZeroLimits(limits)) {
+                getWidthHeight().then(function(dimensions) {
+                    var failingLimit = getFailingLimit(limits, dimensions);
+                    if (failingLimit) {
+                        validationEffort.failure(failingLimit);
+                    } else {
+                        validationEffort.success();
+                    }
+                }, validationEffort.success);
+            } else {
+                validationEffort.success();
+            }
+            return validationEffort;
+        };
+    };
+    qq.Session = function(spec) {
+        "use strict";
+        var options = {
+            endpoint: null,
+            params: {},
+            customHeaders: {},
+            cors: {},
+            addFileRecord: function(sessionData) {},
+            log: function(message, level) {}
+        };
+        qq.extend(options, spec, true);
+        function isJsonResponseValid(response) {
+            if (qq.isArray(response)) {
+                return true;
+            }
+            options.log("Session response is not an array.", "error");
+        }
+        function handleFileItems(fileItems, success, xhrOrXdr, promise) {
+            var someItemsIgnored = false;
+            success = success && isJsonResponseValid(fileItems);
+            if (success) {
+                qq.each(fileItems, function(idx, fileItem) {
+                    if (fileItem.uuid == null) {
+                        someItemsIgnored = true;
+                        options.log(qq.format("Session response item {} did not include a valid UUID - ignoring.", idx), "error");
+                    } else if (fileItem.name == null) {
+                        someItemsIgnored = true;
+                        options.log(qq.format("Session response item {} did not include a valid name - ignoring.", idx), "error");
+                    } else {
+                        try {
+                            options.addFileRecord(fileItem);
+                            return true;
+                        } catch (err) {
+                            someItemsIgnored = true;
+                            options.log(err.message, "error");
+                        }
+                    }
+                    return false;
+                });
+            }
+            promise[success && !someItemsIgnored ? "success" : "failure"](fileItems, xhrOrXdr);
+        }
+        this.refresh = function() {
+            var refreshEffort = new qq.Promise(), refreshCompleteCallback = function(response, success, xhrOrXdr) {
+                handleFileItems(response, success, xhrOrXdr, refreshEffort);
+            }, requesterOptions = qq.extend({}, options), requester = new qq.SessionAjaxRequester(qq.extend(requesterOptions, {
+                onComplete: refreshCompleteCallback
+            }));
+            requester.queryServer();
+            return refreshEffort;
+        };
+    };
+    qq.SessionAjaxRequester = function(spec) {
+        "use strict";
+        var requester, options = {
+            endpoint: null,
+            customHeaders: {},
+            params: {},
+            cors: {
+                expected: false,
+                sendCredentials: false
+            },
+            onComplete: function(response, success, xhrOrXdr) {},
+            log: function(str, level) {}
+        };
+        qq.extend(options, spec);
+        function onComplete(id, xhrOrXdr, isError) {
+            var response = null;
+            if (xhrOrXdr.responseText != null) {
+                try {
+                    response = qq.parseJson(xhrOrXdr.responseText);
+                } catch (err) {
+                    options.log("Problem parsing session response: " + err.message, "error");
+                    isError = true;
+                }
+            }
+            options.onComplete(response, !isError, xhrOrXdr);
+        }
+        requester = qq.extend(this, new qq.AjaxRequester({
+            acceptHeader: "application/json",
+            validMethods: [ "GET" ],
+            method: "GET",
+            endpointStore: {
+                get: function() {
+                    return options.endpoint;
+                }
+            },
+            customHeaders: options.customHeaders,
+            log: options.log,
+            onComplete: onComplete,
+            cors: options.cors
+        }));
+        qq.extend(this, {
+            queryServer: function() {
+                var params = qq.extend({}, options.params);
+                options.log("Session query request.");
+                requester.initTransport("sessionRefresh").withParams(params).withCacheBuster().send();
+            }
+        });
+    };
+    qq.Scaler = function(spec, log) {
+        "use strict";
+        var self = this, customResizeFunction = spec.customResizer, includeOriginal = spec.sendOriginal, orient = spec.orient, defaultType = spec.defaultType, defaultQuality = spec.defaultQuality / 100, failedToScaleText = spec.failureText, includeExif = spec.includeExif, sizes = this._getSortedSizes(spec.sizes);
+        qq.extend(this, {
+            enabled: qq.supportedFeatures.scaling && sizes.length > 0,
+            getFileRecords: function(originalFileUuid, originalFileName, originalBlobOrBlobData) {
+                var self = this, records = [], originalBlob = originalBlobOrBlobData.blob ? originalBlobOrBlobData.blob : originalBlobOrBlobData, identifier = new qq.Identify(originalBlob, log);
+                if (identifier.isPreviewableSync()) {
+                    qq.each(sizes, function(idx, sizeRecord) {
+                        var outputType = self._determineOutputType({
+                            defaultType: defaultType,
+                            requestedType: sizeRecord.type,
+                            refType: originalBlob.type
+                        });
+                        records.push({
+                            uuid: qq.getUniqueId(),
+                            name: self._getName(originalFileName, {
+                                name: sizeRecord.name,
+                                type: outputType,
+                                refType: originalBlob.type
+                            }),
+                            blob: new qq.BlobProxy(originalBlob, qq.bind(self._generateScaledImage, self, {
+                                customResizeFunction: customResizeFunction,
+                                maxSize: sizeRecord.maxSize,
+                                orient: orient,
+                                type: outputType,
+                                quality: defaultQuality,
+                                failedText: failedToScaleText,
+                                includeExif: includeExif,
+                                log: log
+                            }))
+                        });
+                    });
+                    records.push({
+                        uuid: originalFileUuid,
+                        name: originalFileName,
+                        size: originalBlob.size,
+                        blob: includeOriginal ? originalBlob : null
+                    });
+                } else {
+                    records.push({
+                        uuid: originalFileUuid,
+                        name: originalFileName,
+                        size: originalBlob.size,
+                        blob: originalBlob
+                    });
+                }
+                return records;
+            },
+            handleNewFile: function(file, name, uuid, size, fileList, batchId, uuidParamName, api) {
+                var self = this, buttonId = file.qqButtonId || file.blob && file.blob.qqButtonId, scaledIds = [], originalId = null, addFileToHandler = api.addFileToHandler, uploadData = api.uploadData, paramsStore = api.paramsStore, proxyGroupId = qq.getUniqueId();
+                qq.each(self.getFileRecords(uuid, name, file), function(idx, record) {
+                    var blobSize = record.size, id;
+                    if (record.blob instanceof qq.BlobProxy) {
+                        blobSize = -1;
+                    }
+                    id = uploadData.addFile({
+                        uuid: record.uuid,
+                        name: record.name,
+                        size: blobSize,
+                        batchId: batchId,
+                        proxyGroupId: proxyGroupId
+                    });
+                    if (record.blob instanceof qq.BlobProxy) {
+                        scaledIds.push(id);
+                    } else {
+                        originalId = id;
+                    }
+                    if (record.blob) {
+                        addFileToHandler(id, record.blob);
+                        fileList.push({
+                            id: id,
+                            file: record.blob
+                        });
+                    } else {
+                        uploadData.setStatus(id, qq.status.REJECTED);
+                    }
+                });
+                if (originalId !== null) {
+                    qq.each(scaledIds, function(idx, scaledId) {
+                        var params = {
+                            qqparentuuid: uploadData.retrieve({
+                                id: originalId
+                            }).uuid,
+                            qqparentsize: uploadData.retrieve({
+                                id: originalId
+                            }).size
+                        };
+                        params[uuidParamName] = uploadData.retrieve({
+                            id: scaledId
+                        }).uuid;
+                        uploadData.setParentId(scaledId, originalId);
+                        paramsStore.addReadOnly(scaledId, params);
+                    });
+                    if (scaledIds.length) {
+                        (function() {
+                            var param = {};
+                            param[uuidParamName] = uploadData.retrieve({
+                                id: originalId
+                            }).uuid;
+                            paramsStore.addReadOnly(originalId, param);
+                        })();
+                    }
+                }
+            }
+        });
+    };
+    qq.extend(qq.Scaler.prototype, {
+        scaleImage: function(id, specs, api) {
+            "use strict";
+            if (!qq.supportedFeatures.scaling) {
+                throw new qq.Error("Scaling is not supported in this browser!");
+            }
+            var scalingEffort = new qq.Promise(), log = api.log, file = api.getFile(id), uploadData = api.uploadData.retrieve({
+                id: id
+            }), name = uploadData && uploadData.name, uuid = uploadData && uploadData.uuid, scalingOptions = {
+                customResizer: specs.customResizer,
+                sendOriginal: false,
+                orient: specs.orient,
+                defaultType: specs.type || null,
+                defaultQuality: specs.quality,
+                failedToScaleText: "Unable to scale",
+                sizes: [ {
+                    name: "",
+                    maxSize: specs.maxSize
+                } ]
+            }, scaler = new qq.Scaler(scalingOptions, log);
+            if (!qq.Scaler || !qq.supportedFeatures.imagePreviews || !file) {
+                scalingEffort.failure();
+                log("Could not generate requested scaled image for " + id + ".  " + "Scaling is either not possible in this browser, or the file could not be located.", "error");
+            } else {
+                qq.bind(function() {
+                    var record = scaler.getFileRecords(uuid, name, file)[0];
+                    if (record && record.blob instanceof qq.BlobProxy) {
+                        record.blob.create().then(scalingEffort.success, scalingEffort.failure);
+                    } else {
+                        log(id + " is not a scalable image!", "error");
+                        scalingEffort.failure();
+                    }
+                }, this)();
+            }
+            return scalingEffort;
+        },
+        _determineOutputType: function(spec) {
+            "use strict";
+            var requestedType = spec.requestedType, defaultType = spec.defaultType, referenceType = spec.refType;
+            if (!defaultType && !requestedType) {
+                if (referenceType !== "image/jpeg") {
+                    return "image/png";
+                }
+                return referenceType;
+            }
+            if (!requestedType) {
+                return defaultType;
+            }
+            if (qq.indexOf(Object.keys(qq.Identify.prototype.PREVIEWABLE_MIME_TYPES), requestedType) >= 0) {
+                if (requestedType === "image/tiff") {
+                    return qq.supportedFeatures.tiffPreviews ? requestedType : defaultType;
+                }
+                return requestedType;
+            }
+            return defaultType;
+        },
+        _getName: function(originalName, scaledVersionProperties) {
+            "use strict";
+            var startOfExt = originalName.lastIndexOf("."), versionType = scaledVersionProperties.type || "image/png", referenceType = scaledVersionProperties.refType, scaledName = "", scaledExt = qq.getExtension(originalName), nameAppendage = "";
+            if (scaledVersionProperties.name && scaledVersionProperties.name.trim().length) {
+                nameAppendage = " (" + scaledVersionProperties.name + ")";
+            }
+            if (startOfExt >= 0) {
+                scaledName = originalName.substr(0, startOfExt);
+                if (referenceType !== versionType) {
+                    scaledExt = versionType.split("/")[1];
+                }
+                scaledName += nameAppendage + "." + scaledExt;
+            } else {
+                scaledName = originalName + nameAppendage;
+            }
+            return scaledName;
+        },
+        _getSortedSizes: function(sizes) {
+            "use strict";
+            sizes = qq.extend([], sizes);
+            return sizes.sort(function(a, b) {
+                if (a.maxSize > b.maxSize) {
+                    return 1;
+                }
+                if (a.maxSize < b.maxSize) {
+                    return -1;
+                }
+                return 0;
+            });
+        },
+        _generateScaledImage: function(spec, sourceFile) {
+            "use strict";
+            var self = this, customResizeFunction = spec.customResizeFunction, log = spec.log, maxSize = spec.maxSize, orient = spec.orient, type = spec.type, quality = spec.quality, failedText = spec.failedText, includeExif = spec.includeExif && sourceFile.type === "image/jpeg" && type === "image/jpeg", scalingEffort = new qq.Promise(), imageGenerator = new qq.ImageGenerator(log), canvas = document.createElement("canvas");
+            log("Attempting to generate scaled version for " + sourceFile.name);
+            imageGenerator.generate(sourceFile, canvas, {
+                maxSize: maxSize,
+                orient: orient,
+                customResizeFunction: customResizeFunction
+            }).then(function() {
+                var scaledImageDataUri = canvas.toDataURL(type, quality), signalSuccess = function() {
+                    log("Success generating scaled version for " + sourceFile.name);
+                    var blob = qq.dataUriToBlob(scaledImageDataUri);
+                    scalingEffort.success(blob);
+                };
+                if (includeExif) {
+                    self._insertExifHeader(sourceFile, scaledImageDataUri, log).then(function(scaledImageDataUriWithExif) {
+                        scaledImageDataUri = scaledImageDataUriWithExif;
+                        signalSuccess();
+                    }, function() {
+                        log("Problem inserting EXIF header into scaled image.  Using scaled image w/out EXIF data.", "error");
+                        signalSuccess();
+                    });
+                } else {
+                    signalSuccess();
+                }
+            }, function() {
+                log("Failed attempt to generate scaled version for " + sourceFile.name, "error");
+                scalingEffort.failure(failedText);
+            });
+            return scalingEffort;
+        },
+        _insertExifHeader: function(originalImage, scaledImageDataUri, log) {
+            "use strict";
+            var reader = new FileReader(), insertionEffort = new qq.Promise(), originalImageDataUri = "";
+            reader.onload = function() {
+                originalImageDataUri = reader.result;
+                insertionEffort.success(qq.ExifRestorer.restore(originalImageDataUri, scaledImageDataUri));
+            };
+            reader.onerror = function() {
+                log("Problem reading " + originalImage.name + " during attempt to transfer EXIF data to scaled version.", "error");
+                insertionEffort.failure();
+            };
+            reader.readAsDataURL(originalImage);
+            return insertionEffort;
+        },
+        _dataUriToBlob: function(dataUri) {
+            "use strict";
+            var byteString, mimeString, arrayBuffer, intArray;
+            if (dataUri.split(",")[0].indexOf("base64") >= 0) {
+                byteString = atob(dataUri.split(",")[1]);
+            } else {
+                byteString = decodeURI(dataUri.split(",")[1]);
+            }
+            mimeString = dataUri.split(",")[0].split(":")[1].split(";")[0];
+            arrayBuffer = new ArrayBuffer(byteString.length);
+            intArray = new Uint8Array(arrayBuffer);
+            qq.each(byteString, function(idx, character) {
+                intArray[idx] = character.charCodeAt(0);
+            });
+            return this._createBlob(arrayBuffer, mimeString);
+        },
+        _createBlob: function(data, mime) {
+            "use strict";
+            var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder, blobBuilder = BlobBuilder && new BlobBuilder();
+            if (blobBuilder) {
+                blobBuilder.append(data);
+                return blobBuilder.getBlob(mime);
+            } else {
+                return new Blob([ data ], {
+                    type: mime
+                });
+            }
+        }
+    });
+    qq.ExifRestorer = function() {
+        var ExifRestorer = {};
+        ExifRestorer.KEY_STR = "ABCDEFGHIJKLMNOP" + "QRSTUVWXYZabcdef" + "ghijklmnopqrstuv" + "wxyz0123456789+/" + "=";
+        ExifRestorer.encode64 = function(input) {
+            var output = "", chr1, chr2, chr3 = "", enc1, enc2, enc3, enc4 = "", i = 0;
+            do {
+                chr1 = input[i++];
+                chr2 = input[i++];
+                chr3 = input[i++];
+                enc1 = chr1 >> 2;
+                enc2 = (chr1 & 3) << 4 | chr2 >> 4;
+                enc3 = (chr2 & 15) << 2 | chr3 >> 6;
+                enc4 = chr3 & 63;
+                if (isNaN(chr2)) {
+                    enc3 = enc4 = 64;
+                } else if (isNaN(chr3)) {
+                    enc4 = 64;
+                }
+                output = output + this.KEY_STR.charAt(enc1) + this.KEY_STR.charAt(enc2) + this.KEY_STR.charAt(enc3) + this.KEY_STR.charAt(enc4);
+                chr1 = chr2 = chr3 = "";
+                enc1 = enc2 = enc3 = enc4 = "";
+            } while (i < input.length);
+            return output;
+        };
+        ExifRestorer.restore = function(origFileBase64, resizedFileBase64) {
+            var expectedBase64Header = "data:image/jpeg;base64,";
+            if (!origFileBase64.match(expectedBase64Header)) {
+                return resizedFileBase64;
+            }
+            var rawImage = this.decode64(origFileBase64.replace(expectedBase64Header, ""));
+            var segments = this.slice2Segments(rawImage);
+            var image = this.exifManipulation(resizedFileBase64, segments);
+            return expectedBase64Header + this.encode64(image);
+        };
+        ExifRestorer.exifManipulation = function(resizedFileBase64, segments) {
+            var exifArray = this.getExifArray(segments), newImageArray = this.insertExif(resizedFileBase64, exifArray), aBuffer = new Uint8Array(newImageArray);
+            return aBuffer;
+        };
+        ExifRestorer.getExifArray = function(segments) {
+            var seg;
+            for (var x = 0; x < segments.length; x++) {
+                seg = segments[x];
+                if (seg[0] == 255 & seg[1] == 225) {
+                    return seg;
+                }
+            }
+            return [];
+        };
+        ExifRestorer.insertExif = function(resizedFileBase64, exifArray) {
+            var imageData = resizedFileBase64.replace("data:image/jpeg;base64,", ""), buf = this.decode64(imageData), separatePoint = buf.indexOf(255, 3), mae = buf.slice(0, separatePoint), ato = buf.slice(separatePoint), array = mae;
+            array = array.concat(exifArray);
+            array = array.concat(ato);
+            return array;
+        };
+        ExifRestorer.slice2Segments = function(rawImageArray) {
+            var head = 0, segments = [];
+            while (1) {
+                if (rawImageArray[head] == 255 & rawImageArray[head + 1] == 218) {
+                    break;
+                }
+                if (rawImageArray[head] == 255 & rawImageArray[head + 1] == 216) {
+                    head += 2;
+                } else {
+                    var length = rawImageArray[head + 2] * 256 + rawImageArray[head + 3], endPoint = head + length + 2, seg = rawImageArray.slice(head, endPoint);
+                    segments.push(seg);
+                    head = endPoint;
+                }
+                if (head > rawImageArray.length) {
+                    break;
+                }
+            }
+            return segments;
+        };
+        ExifRestorer.decode64 = function(input) {
+            var output = "", chr1, chr2, chr3 = "", enc1, enc2, enc3, enc4 = "", i = 0, buf = [];
+            var base64test = /[^A-Za-z0-9\+\/\=]/g;
+            if (base64test.exec(input)) {
+                throw new Error("There were invalid base64 characters in the input text.  " + "Valid base64 characters are A-Z, a-z, 0-9, '+', '/',and '='");
+            }
+            input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+            do {
+                enc1 = this.KEY_STR.indexOf(input.charAt(i++));
+                enc2 = this.KEY_STR.indexOf(input.charAt(i++));
+                enc3 = this.KEY_STR.indexOf(input.charAt(i++));
+                enc4 = this.KEY_STR.indexOf(input.charAt(i++));
+                chr1 = enc1 << 2 | enc2 >> 4;
+                chr2 = (enc2 & 15) << 4 | enc3 >> 2;
+                chr3 = (enc3 & 3) << 6 | enc4;
+                buf.push(chr1);
+                if (enc3 != 64) {
+                    buf.push(chr2);
+                }
+                if (enc4 != 64) {
+                    buf.push(chr3);
+                }
+                chr1 = chr2 = chr3 = "";
+                enc1 = enc2 = enc3 = enc4 = "";
+            } while (i < input.length);
+            return buf;
+        };
+        return ExifRestorer;
+    }();
+    qq.TotalProgress = function(callback, getSize) {
+        "use strict";
+        var perFileProgress = {}, totalLoaded = 0, totalSize = 0, lastLoadedSent = -1, lastTotalSent = -1, callbackProxy = function(loaded, total) {
+            if (loaded !== lastLoadedSent || total !== lastTotalSent) {
+                callback(loaded, total);
+            }
+            lastLoadedSent = loaded;
+            lastTotalSent = total;
+        }, noRetryableFiles = function(failed, retryable) {
+            var none = true;
+            qq.each(failed, function(idx, failedId) {
+                if (qq.indexOf(retryable, failedId) >= 0) {
+                    none = false;
+                    return false;
+                }
+            });
+            return none;
+        }, onCancel = function(id) {
+            updateTotalProgress(id, -1, -1);
+            delete perFileProgress[id];
+        }, onAllComplete = function(successful, failed, retryable) {
+            if (failed.length === 0 || noRetryableFiles(failed, retryable)) {
+                callbackProxy(totalSize, totalSize);
+                this.reset();
+            }
+        }, onNew = function(id) {
+            var size = getSize(id);
+            if (size > 0) {
+                updateTotalProgress(id, 0, size);
+                perFileProgress[id] = {
+                    loaded: 0,
+                    total: size
+                };
+            }
+        }, updateTotalProgress = function(id, newLoaded, newTotal) {
+            var oldLoaded = perFileProgress[id] ? perFileProgress[id].loaded : 0, oldTotal = perFileProgress[id] ? perFileProgress[id].total : 0;
+            if (newLoaded === -1 && newTotal === -1) {
+                totalLoaded -= oldLoaded;
+                totalSize -= oldTotal;
+            } else {
+                if (newLoaded) {
+                    totalLoaded += newLoaded - oldLoaded;
+                }
+                if (newTotal) {
+                    totalSize += newTotal - oldTotal;
+                }
+            }
+            callbackProxy(totalLoaded, totalSize);
+        };
+        qq.extend(this, {
+            onAllComplete: onAllComplete,
+            onStatusChange: function(id, oldStatus, newStatus) {
+                if (newStatus === qq.status.CANCELED || newStatus === qq.status.REJECTED) {
+                    onCancel(id);
+                } else if (newStatus === qq.status.SUBMITTING) {
+                    onNew(id);
+                }
+            },
+            onIndividualProgress: function(id, loaded, total) {
+                updateTotalProgress(id, loaded, total);
+                perFileProgress[id] = {
+                    loaded: loaded,
+                    total: total
+                };
+            },
+            onNewSize: function(id) {
+                onNew(id);
+            },
+            reset: function() {
+                perFileProgress = {};
+                totalLoaded = 0;
+                totalSize = 0;
+            }
+        });
+    };
+    qq.PasteSupport = function(o) {
+        "use strict";
+        var options, detachPasteHandler;
+        options = {
+            targetElement: null,
+            callbacks: {
+                log: function(message, level) {},
+                pasteReceived: function(blob) {}
+            }
+        };
+        function isImage(item) {
+            return item.type && item.type.indexOf("image/") === 0;
+        }
+        function registerPasteHandler() {
+            detachPasteHandler = qq(options.targetElement).attach("paste", function(event) {
+                var clipboardData = event.clipboardData;
+                if (clipboardData) {
+                    qq.each(clipboardData.items, function(idx, item) {
+                        if (isImage(item)) {
+                            var blob = item.getAsFile();
+                            options.callbacks.pasteReceived(blob);
+                        }
+                    });
+                }
+            });
+        }
+        function unregisterPasteHandler() {
+            if (detachPasteHandler) {
+                detachPasteHandler();
+            }
+        }
+        qq.extend(options, o);
+        registerPasteHandler();
+        qq.extend(this, {
+            reset: function() {
+                unregisterPasteHandler();
+            }
+        });
+    };
+    qq.FormSupport = function(options, startUpload, log) {
+        "use strict";
+        var self = this, interceptSubmit = options.interceptSubmit, formEl = options.element, autoUpload = options.autoUpload;
+        qq.extend(this, {
+            newEndpoint: null,
+            newAutoUpload: autoUpload,
+            attachedToForm: false,
+            getFormInputsAsObject: function() {
+                if (formEl == null) {
+                    return null;
+                }
+                return self._form2Obj(formEl);
+            }
+        });
+        function determineNewEndpoint(formEl) {
+            if (formEl.getAttribute("action")) {
+                self.newEndpoint = formEl.getAttribute("action");
+            }
+        }
+        function validateForm(formEl, nativeSubmit) {
+            if (formEl.checkValidity && !formEl.checkValidity()) {
+                log("Form did not pass validation checks - will not upload.", "error");
+                nativeSubmit();
+            } else {
+                return true;
+            }
+        }
+        function maybeUploadOnSubmit(formEl) {
+            var nativeSubmit = formEl.submit;
+            qq(formEl).attach("submit", function(event) {
+                event = event || window.event;
+                if (event.preventDefault) {
+                    event.preventDefault();
+                } else {
+                    event.returnValue = false;
+                }
+                validateForm(formEl, nativeSubmit) && startUpload();
+            });
+            formEl.submit = function() {
+                validateForm(formEl, nativeSubmit) && startUpload();
+            };
+        }
+        function determineFormEl(formEl) {
+            if (formEl) {
+                if (qq.isString(formEl)) {
+                    formEl = document.getElementById(formEl);
+                }
+                if (formEl) {
+                    log("Attaching to form element.");
+                    determineNewEndpoint(formEl);
+                    interceptSubmit && maybeUploadOnSubmit(formEl);
+                }
+            }
+            return formEl;
+        }
+        formEl = determineFormEl(formEl);
+        this.attachedToForm = !!formEl;
+    };
+    qq.extend(qq.FormSupport.prototype, {
+        _form2Obj: function(form) {
+            "use strict";
+            var obj = {}, notIrrelevantType = function(type) {
+                var irrelevantTypes = [ "button", "image", "reset", "submit" ];
+                return qq.indexOf(irrelevantTypes, type.toLowerCase()) < 0;
+            }, radioOrCheckbox = function(type) {
+                return qq.indexOf([ "checkbox", "radio" ], type.toLowerCase()) >= 0;
+            }, ignoreValue = function(el) {
+                if (radioOrCheckbox(el.type) && !el.checked) {
+                    return true;
+                }
+                return el.disabled && el.type.toLowerCase() !== "hidden";
+            }, selectValue = function(select) {
+                var value = null;
+                qq.each(qq(select).children(), function(idx, child) {
+                    if (child.tagName.toLowerCase() === "option" && child.selected) {
+                        value = child.value;
+                        return false;
+                    }
+                });
+                return value;
+            };
+            qq.each(form.elements, function(idx, el) {
+                if ((qq.isInput(el, true) || el.tagName.toLowerCase() === "textarea") && notIrrelevantType(el.type) && !ignoreValue(el)) {
+                    obj[el.name] = el.value;
+                } else if (el.tagName.toLowerCase() === "select" && !ignoreValue(el)) {
+                    var value = selectValue(el);
+                    if (value !== null) {
+                        obj[el.name] = value;
+                    }
+                }
+            });
+            return obj;
+        }
+    });
+    qq.traditional = qq.traditional || {};
+    qq.traditional.FormUploadHandler = function(options, proxy) {
+        "use strict";
+        var handler = this, getName = proxy.getName, getUuid = proxy.getUuid, log = proxy.log;
+        function getIframeContentJson(id, iframe) {
+            var response, doc, innerHtml;
+            try {
+                doc = iframe.contentDocument || iframe.contentWindow.document;
+                innerHtml = doc.body.innerHTML;
+                log("converting iframe's innerHTML to JSON");
+                log("innerHTML = " + innerHtml);
+                if (innerHtml && innerHtml.match(/^<pre/i)) {
+                    innerHtml = doc.body.firstChild.firstChild.nodeValue;
+                }
+                response = handler._parseJsonResponse(innerHtml);
+            } catch (error) {
+                log("Error when attempting to parse form upload response (" + error.message + ")", "error");
+                response = {
+                    success: false
+                };
+            }
+            return response;
+        }
+        function createForm(id, iframe) {
+            var params = options.paramsStore.get(id), method = options.method.toLowerCase() === "get" ? "GET" : "POST", endpoint = options.endpointStore.get(id), name = getName(id);
+            params[options.uuidName] = getUuid(id);
+            params[options.filenameParam] = name;
+            return handler._initFormForUpload({
+                method: method,
+                endpoint: endpoint,
+                params: params,
+                paramsInBody: options.paramsInBody,
+                targetName: iframe.name
+            });
+        }
+        this.uploadFile = function(id) {
+            var input = handler.getInput(id), iframe = handler._createIframe(id), promise = new qq.Promise(), form;
+            form = createForm(id, iframe);
+            form.appendChild(input);
+            handler._attachLoadEvent(iframe, function(responseFromMessage) {
+                log("iframe loaded");
+                var response = responseFromMessage ? responseFromMessage : getIframeContentJson(id, iframe);
+                handler._detachLoadEvent(id);
+                if (!options.cors.expected) {
+                    qq(iframe).remove();
+                }
+                if (response.success) {
+                    promise.success(response);
+                } else {
+                    promise.failure(response);
+                }
+            });
+            log("Sending upload request for " + id);
+            form.submit();
+            qq(form).remove();
+            return promise;
+        };
+        qq.extend(this, new qq.FormUploadHandler({
+            options: {
+                isCors: options.cors.expected,
+                inputName: options.inputName
+            },
+            proxy: {
+                onCancel: options.onCancel,
+                getName: getName,
+                getUuid: getUuid,
+                log: log
+            }
+        }));
+    };
+    qq.traditional = qq.traditional || {};
+    qq.traditional.XhrUploadHandler = function(spec, proxy) {
+        "use strict";
+        var handler = this, getName = proxy.getName, getSize = proxy.getSize, getUuid = proxy.getUuid, log = proxy.log, multipart = spec.forceMultipart || spec.paramsInBody, addChunkingSpecificParams = function(id, params, chunkData) {
+            var size = getSize(id), name = getName(id);
+            params[spec.chunking.paramNames.partIndex] = chunkData.part;
+            params[spec.chunking.paramNames.partByteOffset] = chunkData.start;
+            params[spec.chunking.paramNames.chunkSize] = chunkData.size;
+            params[spec.chunking.paramNames.totalParts] = chunkData.count;
+            params[spec.totalFileSizeName] = size;
+            if (multipart) {
+                params[spec.filenameParam] = name;
+            }
+        }, allChunksDoneRequester = new qq.traditional.AllChunksDoneAjaxRequester({
+            cors: spec.cors,
+            endpoint: spec.chunking.success.endpoint,
+            log: log
+        }), createReadyStateChangedHandler = function(id, xhr) {
+            var promise = new qq.Promise();
+            xhr.onreadystatechange = function() {
+                if (xhr.readyState === 4) {
+                    var result = onUploadOrChunkComplete(id, xhr);
+                    if (result.success) {
+                        promise.success(result.response, xhr);
+                    } else {
+                        promise.failure(result.response, xhr);
+                    }
+                }
+            };
+            return promise;
+        }, getChunksCompleteParams = function(id) {
+            var params = spec.paramsStore.get(id), name = getName(id), size = getSize(id);
+            params[spec.uuidName] = getUuid(id);
+            params[spec.filenameParam] = name;
+            params[spec.totalFileSizeName] = size;
+            params[spec.chunking.paramNames.totalParts] = handler._getTotalChunks(id);
+            return params;
+        }, isErrorUploadResponse = function(xhr, response) {
+            return qq.indexOf([ 200, 201, 202, 203, 204 ], xhr.status) < 0 || !response.success || response.reset;
+        }, onUploadOrChunkComplete = function(id, xhr) {
+            var response;
+            log("xhr - server response received for " + id);
+            log("responseText = " + xhr.responseText);
+            response = parseResponse(true, xhr);
+            return {
+                success: !isErrorUploadResponse(xhr, response),
+                response: response
+            };
+        }, parseResponse = function(upload, xhr) {
+            var response = {};
+            try {
+                log(qq.format("Received response status {} with body: {}", xhr.status, xhr.responseText));
+                response = qq.parseJson(xhr.responseText);
+            } catch (error) {
+                upload && log("Error when attempting to parse xhr response text (" + error.message + ")", "error");
+            }
+            return response;
+        }, sendChunksCompleteRequest = function(id) {
+            var promise = new qq.Promise();
+            allChunksDoneRequester.complete(id, handler._createXhr(id), getChunksCompleteParams(id), spec.customHeaders.get(id)).then(function(xhr) {
+                promise.success(parseResponse(false, xhr), xhr);
+            }, function(xhr) {
+                promise.failure(parseResponse(false, xhr), xhr);
+            });
+            return promise;
+        }, setParamsAndGetEntityToSend = function(params, xhr, fileOrBlob, id) {
+            var formData = new FormData(), method = spec.method, endpoint = spec.endpointStore.get(id), name = getName(id), size = getSize(id);
+            params[spec.uuidName] = getUuid(id);
+            params[spec.filenameParam] = name;
+            if (multipart) {
+                params[spec.totalFileSizeName] = size;
+            }
+            if (!spec.paramsInBody) {
+                if (!multipart) {
+                    params[spec.inputName] = name;
+                }
+                endpoint = qq.obj2url(params, endpoint);
+            }
+            xhr.open(method, endpoint, true);
+            if (spec.cors.expected && spec.cors.sendCredentials) {
+                xhr.withCredentials = true;
+            }
+            if (multipart) {
+                if (spec.paramsInBody) {
+                    qq.obj2FormData(params, formData);
+                }
+                formData.append(spec.inputName, fileOrBlob);
+                return formData;
+            }
+            return fileOrBlob;
+        }, setUploadHeaders = function(id, xhr) {
+            var extraHeaders = spec.customHeaders.get(id), fileOrBlob = handler.getFile(id);
+            xhr.setRequestHeader("Accept", "application/json");
+            xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+            xhr.setRequestHeader("Cache-Control", "no-cache");
+            if (!multipart) {
+                xhr.setRequestHeader("Content-Type", "application/octet-stream");
+                xhr.setRequestHeader("X-Mime-Type", fileOrBlob.type);
+            }
+            qq.each(extraHeaders, function(name, val) {
+                xhr.setRequestHeader(name, val);
+            });
+        };
+        qq.extend(this, {
+            uploadChunk: function(id, chunkIdx, resuming) {
+                var chunkData = handler._getChunkData(id, chunkIdx), xhr = handler._createXhr(id, chunkIdx), size = getSize(id), promise, toSend, params;
+                promise = createReadyStateChangedHandler(id, xhr);
+                handler._registerProgressHandler(id, chunkIdx, chunkData.size);
+                params = spec.paramsStore.get(id);
+                addChunkingSpecificParams(id, params, chunkData);
+                if (resuming) {
+                    params[spec.resume.paramNames.resuming] = true;
+                }
+                toSend = setParamsAndGetEntityToSend(params, xhr, chunkData.blob, id);
+                setUploadHeaders(id, xhr);
+                xhr.send(toSend);
+                return promise;
+            },
+            uploadFile: function(id) {
+                var fileOrBlob = handler.getFile(id), promise, xhr, params, toSend;
+                xhr = handler._createXhr(id);
+                handler._registerProgressHandler(id);
+                promise = createReadyStateChangedHandler(id, xhr);
+                params = spec.paramsStore.get(id);
+                toSend = setParamsAndGetEntityToSend(params, xhr, fileOrBlob, id);
+                setUploadHeaders(id, xhr);
+                xhr.send(toSend);
+                return promise;
+            }
+        });
+        qq.extend(this, new qq.XhrUploadHandler({
+            options: qq.extend({
+                namespace: "traditional"
+            }, spec),
+            proxy: qq.extend({
+                getEndpoint: spec.endpointStore.get
+            }, proxy)
+        }));
+        qq.override(this, function(super_) {
+            return {
+                finalizeChunks: function(id) {
+                    if (spec.chunking.success.endpoint) {
+                        return sendChunksCompleteRequest(id);
+                    } else {
+                        return super_.finalizeChunks(id, qq.bind(parseResponse, this, true));
+                    }
+                }
+            };
+        });
+    };
+    qq.traditional.AllChunksDoneAjaxRequester = function(o) {
+        "use strict";
+        var requester, method = "POST", options = {
+            cors: {
+                allowXdr: false,
+                expected: false,
+                sendCredentials: false
+            },
+            endpoint: null,
+            log: function(str, level) {}
+        }, promises = {}, endpointHandler = {
+            get: function(id) {
+                return options.endpoint;
+            }
+        };
+        qq.extend(options, o);
+        requester = qq.extend(this, new qq.AjaxRequester({
+            acceptHeader: "application/json",
+            validMethods: [ method ],
+            method: method,
+            endpointStore: endpointHandler,
+            allowXRequestedWithAndCacheControl: false,
+            cors: options.cors,
+            log: options.log,
+            onComplete: function(id, xhr, isError) {
+                var promise = promises[id];
+                delete promises[id];
+                if (isError) {
+                    promise.failure(xhr);
+                } else {
+                    promise.success(xhr);
+                }
+            }
+        }));
+        qq.extend(this, {
+            complete: function(id, xhr, params, headers) {
+                var promise = new qq.Promise();
+                options.log("Submitting All Chunks Done request for " + id);
+                promises[id] = promise;
+                requester.initTransport(id).withParams(params).withHeaders(headers).send(xhr);
+                return promise;
+            }
+        });
+    };
+    qq.DragAndDrop = function(o) {
+        "use strict";
+        var options, HIDE_ZONES_EVENT_NAME = "qq-hidezones", HIDE_BEFORE_ENTER_ATTR = "qq-hide-dropzone", uploadDropZones = [], droppedFiles = [], disposeSupport = new qq.DisposeSupport();
+        options = {
+            dropZoneElements: [],
+            allowMultipleItems: true,
+            classes: {
+                dropActive: null
+            },
+            callbacks: new qq.DragAndDrop.callbacks()
+        };
+        qq.extend(options, o, true);
+        function uploadDroppedFiles(files, uploadDropZone) {
+            var filesAsArray = Array.prototype.slice.call(files);
+            options.callbacks.dropLog("Grabbed " + files.length + " dropped files.");
+            uploadDropZone.dropDisabled(false);
+            options.callbacks.processingDroppedFilesComplete(filesAsArray, uploadDropZone.getElement());
+        }
+        function traverseFileTree(entry) {
+            var parseEntryPromise = new qq.Promise();
+            if (entry.isFile) {
+                entry.file(function(file) {
+                    var name = entry.name, fullPath = entry.fullPath, indexOfNameInFullPath = fullPath.indexOf(name);
+                    fullPath = fullPath.substr(0, indexOfNameInFullPath);
+                    if (fullPath.charAt(0) === "/") {
+                        fullPath = fullPath.substr(1);
+                    }
+                    file.qqPath = fullPath;
+                    droppedFiles.push(file);
+                    parseEntryPromise.success();
+                }, function(fileError) {
+                    options.callbacks.dropLog("Problem parsing '" + entry.fullPath + "'.  FileError code " + fileError.code + ".", "error");
+                    parseEntryPromise.failure();
+                });
+            } else if (entry.isDirectory) {
+                getFilesInDirectory(entry).then(function allEntriesRead(entries) {
+                    var entriesLeft = entries.length;
+                    qq.each(entries, function(idx, entry) {
+                        traverseFileTree(entry).done(function() {
+                            entriesLeft -= 1;
+                            if (entriesLeft === 0) {
+                                parseEntryPromise.success();
+                            }
+                        });
+                    });
+                    if (!entries.length) {
+                        parseEntryPromise.success();
+                    }
+                }, function readFailure(fileError) {
+                    options.callbacks.dropLog("Problem parsing '" + entry.fullPath + "'.  FileError code " + fileError.code + ".", "error");
+                    parseEntryPromise.failure();
+                });
+            }
+            return parseEntryPromise;
+        }
+        function getFilesInDirectory(entry, reader, accumEntries, existingPromise) {
+            var promise = existingPromise || new qq.Promise(), dirReader = reader || entry.createReader();
+            dirReader.readEntries(function readSuccess(entries) {
+                var newEntries = accumEntries ? accumEntries.concat(entries) : entries;
+                if (entries.length) {
+                    setTimeout(function() {
+                        getFilesInDirectory(entry, dirReader, newEntries, promise);
+                    }, 0);
+                } else {
+                    promise.success(newEntries);
+                }
+            }, promise.failure);
+            return promise;
+        }
+        function handleDataTransfer(dataTransfer, uploadDropZone) {
+            var pendingFolderPromises = [], handleDataTransferPromise = new qq.Promise();
+            options.callbacks.processingDroppedFiles();
+            uploadDropZone.dropDisabled(true);
+            if (dataTransfer.files.length > 1 && !options.allowMultipleItems) {
+                options.callbacks.processingDroppedFilesComplete([]);
+                options.callbacks.dropError("tooManyFilesError", "");
+                uploadDropZone.dropDisabled(false);
+                handleDataTransferPromise.failure();
+            } else {
+                droppedFiles = [];
+                if (qq.isFolderDropSupported(dataTransfer)) {
+                    qq.each(dataTransfer.items, function(idx, item) {
+                        var entry = item.webkitGetAsEntry();
+                        if (entry) {
+                            if (entry.isFile) {
+                                droppedFiles.push(item.getAsFile());
+                            } else {
+                                pendingFolderPromises.push(traverseFileTree(entry).done(function() {
+                                    pendingFolderPromises.pop();
+                                    if (pendingFolderPromises.length === 0) {
+                                        handleDataTransferPromise.success();
+                                    }
+                                }));
+                            }
+                        }
+                    });
+                } else {
+                    droppedFiles = dataTransfer.files;
+                }
+                if (pendingFolderPromises.length === 0) {
+                    handleDataTransferPromise.success();
+                }
+            }
+            return handleDataTransferPromise;
+        }
+        function setupDropzone(dropArea) {
+            var dropZone = new qq.UploadDropZone({
+                HIDE_ZONES_EVENT_NAME: HIDE_ZONES_EVENT_NAME,
+                element: dropArea,
+                onEnter: function(e) {
+                    qq(dropArea).addClass(options.classes.dropActive);
+                    e.stopPropagation();
+                },
+                onLeaveNotDescendants: function(e) {
+                    qq(dropArea).removeClass(options.classes.dropActive);
+                },
+                onDrop: function(e) {
+                    handleDataTransfer(e.dataTransfer, dropZone).then(function() {
+                        uploadDroppedFiles(droppedFiles, dropZone);
+                    }, function() {
+                        options.callbacks.dropLog("Drop event DataTransfer parsing failed.  No files will be uploaded.", "error");
+                    });
+                }
+            });
+            disposeSupport.addDisposer(function() {
+                dropZone.dispose();
+            });
+            qq(dropArea).hasAttribute(HIDE_BEFORE_ENTER_ATTR) && qq(dropArea).hide();
+            uploadDropZones.push(dropZone);
+            return dropZone;
+        }
+        function isFileDrag(dragEvent) {
+            var fileDrag;
+            qq.each(dragEvent.dataTransfer.types, function(key, val) {
+                if (val === "Files") {
+                    fileDrag = true;
+                    return false;
+                }
+            });
+            return fileDrag;
+        }
+        function leavingDocumentOut(e) {
+            if (qq.safari()) {
+                return e.x < 0 || e.y < 0;
+            }
+            return e.x === 0 && e.y === 0;
+        }
+        function setupDragDrop() {
+            var dropZones = options.dropZoneElements, maybeHideDropZones = function() {
+                setTimeout(function() {
+                    qq.each(dropZones, function(idx, dropZone) {
+                        qq(dropZone).hasAttribute(HIDE_BEFORE_ENTER_ATTR) && qq(dropZone).hide();
+                        qq(dropZone).removeClass(options.classes.dropActive);
+                    });
+                }, 10);
+            };
+            qq.each(dropZones, function(idx, dropZone) {
+                var uploadDropZone = setupDropzone(dropZone);
+                if (dropZones.length && qq.supportedFeatures.fileDrop) {
+                    disposeSupport.attach(document, "dragenter", function(e) {
+                        if (!uploadDropZone.dropDisabled() && isFileDrag(e)) {
+                            qq.each(dropZones, function(idx, dropZone) {
+                                if (dropZone instanceof HTMLElement && qq(dropZone).hasAttribute(HIDE_BEFORE_ENTER_ATTR)) {
+                                    qq(dropZone).css({
+                                        display: "block"
+                                    });
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+            disposeSupport.attach(document, "dragleave", function(e) {
+                if (leavingDocumentOut(e)) {
+                    maybeHideDropZones();
+                }
+            });
+            disposeSupport.attach(qq(document).children()[0], "mouseenter", function(e) {
+                maybeHideDropZones();
+            });
+            disposeSupport.attach(document, "drop", function(e) {
+                if (isFileDrag(e)) {
+                    e.preventDefault();
+                    maybeHideDropZones();
+                }
+            });
+            disposeSupport.attach(document, HIDE_ZONES_EVENT_NAME, maybeHideDropZones);
+        }
+        setupDragDrop();
+        qq.extend(this, {
+            setupExtraDropzone: function(element) {
+                options.dropZoneElements.push(element);
+                setupDropzone(element);
+            },
+            removeDropzone: function(element) {
+                var i, dzs = options.dropZoneElements;
+                for (i in dzs) {
+                    if (dzs[i] === element) {
+                        return dzs.splice(i, 1);
+                    }
+                }
+            },
+            dispose: function() {
+                disposeSupport.dispose();
+                qq.each(uploadDropZones, function(idx, dropZone) {
+                    dropZone.dispose();
+                });
+            }
+        });
+    };
+    qq.DragAndDrop.callbacks = function() {
+        "use strict";
+        return {
+            processingDroppedFiles: function() {},
+            processingDroppedFilesComplete: function(files, targetEl) {},
+            dropError: function(code, errorSpecifics) {
+                qq.log("Drag & drop error code '" + code + " with these specifics: '" + errorSpecifics + "'", "error");
+            },
+            dropLog: function(message, level) {
+                qq.log(message, level);
+            }
+        };
+    };
+    qq.UploadDropZone = function(o) {
+        "use strict";
+        var disposeSupport = new qq.DisposeSupport(), options, element, preventDrop, dropOutsideDisabled;
+        options = {
+            element: null,
+            onEnter: function(e) {},
+            onLeave: function(e) {},
+            onLeaveNotDescendants: function(e) {},
+            onDrop: function(e) {}
+        };
+        qq.extend(options, o);
+        element = options.element;
+        function dragoverShouldBeCanceled() {
+            return qq.safari() || qq.firefox() && qq.windows();
+        }
+        function disableDropOutside(e) {
+            if (!dropOutsideDisabled) {
+                if (dragoverShouldBeCanceled) {
+                    disposeSupport.attach(document, "dragover", function(e) {
+                        e.preventDefault();
+                    });
+                } else {
+                    disposeSupport.attach(document, "dragover", function(e) {
+                        if (e.dataTransfer) {
+                            e.dataTransfer.dropEffect = "none";
+                            e.preventDefault();
+                        }
+                    });
+                }
+                dropOutsideDisabled = true;
+            }
+        }
+        function isValidFileDrag(e) {
+            if (!qq.supportedFeatures.fileDrop) {
+                return false;
+            }
+            var effectTest, dt = e.dataTransfer, isSafari = qq.safari();
+            effectTest = qq.ie() && qq.supportedFeatures.fileDrop ? true : dt.effectAllowed !== "none";
+            return dt && effectTest && (dt.files && dt.files.length || !isSafari && dt.types.contains && dt.types.contains("Files") || dt.types.includes && dt.types.includes("Files"));
+        }
+        function isOrSetDropDisabled(isDisabled) {
+            if (isDisabled !== undefined) {
+                preventDrop = isDisabled;
+            }
+            return preventDrop;
+        }
+        function triggerHidezonesEvent() {
+            var hideZonesEvent;
+            function triggerUsingOldApi() {
+                hideZonesEvent = document.createEvent("Event");
+                hideZonesEvent.initEvent(options.HIDE_ZONES_EVENT_NAME, true, true);
+            }
+            if (window.CustomEvent) {
+                try {
+                    hideZonesEvent = new CustomEvent(options.HIDE_ZONES_EVENT_NAME);
+                } catch (err) {
+                    triggerUsingOldApi();
+                }
+            } else {
+                triggerUsingOldApi();
+            }
+            document.dispatchEvent(hideZonesEvent);
+        }
+        function attachEvents() {
+            disposeSupport.attach(element, "dragover", function(e) {
+                if (!isValidFileDrag(e)) {
+                    return;
+                }
+                var effect = qq.ie() && qq.supportedFeatures.fileDrop ? null : e.dataTransfer.effectAllowed;
+                if (effect === "move" || effect === "linkMove") {
+                    e.dataTransfer.dropEffect = "move";
+                } else {
+                    e.dataTransfer.dropEffect = "copy";
+                }
+                e.stopPropagation();
+                e.preventDefault();
+            });
+            disposeSupport.attach(element, "dragenter", function(e) {
+                if (!isOrSetDropDisabled()) {
+                    if (!isValidFileDrag(e)) {
+                        return;
+                    }
+                    options.onEnter(e);
+                }
+            });
+            disposeSupport.attach(element, "dragleave", function(e) {
+                if (!isValidFileDrag(e)) {
+                    return;
+                }
+                options.onLeave(e);
+                var relatedTarget = document.elementFromPoint(e.clientX, e.clientY);
+                if (qq(this).contains(relatedTarget)) {
+                    return;
+                }
+                options.onLeaveNotDescendants(e);
+            });
+            disposeSupport.attach(element, "drop", function(e) {
+                if (!isOrSetDropDisabled()) {
+                    if (!isValidFileDrag(e)) {
+                        return;
+                    }
+                    e.preventDefault();
+                    e.stopPropagation();
+                    options.onDrop(e);
+                    triggerHidezonesEvent();
+                }
+            });
+        }
+        disableDropOutside();
+        attachEvents();
+        qq.extend(this, {
+            dropDisabled: function(isDisabled) {
+                return isOrSetDropDisabled(isDisabled);
+            },
+            dispose: function() {
+                disposeSupport.dispose();
+            },
+            getElement: function() {
+                return element;
+            }
+        });
+        this._testing = {};
+        this._testing.isValidFileDrag = isValidFileDrag;
+    };
+    (function() {
+        "use strict";
+        qq.uiPublicApi = {
+            addInitialFiles: function(cannedFileList) {
+                this._parent.prototype.addInitialFiles.apply(this, arguments);
+                this._templating.addCacheToDom();
+            },
+            clearStoredFiles: function() {
+                this._parent.prototype.clearStoredFiles.apply(this, arguments);
+                this._templating.clearFiles();
+            },
+            addExtraDropzone: function(element) {
+                this._dnd && this._dnd.setupExtraDropzone(element);
+            },
+            removeExtraDropzone: function(element) {
+                if (this._dnd) {
+                    return this._dnd.removeDropzone(element);
+                }
+            },
+            getItemByFileId: function(id) {
+                if (!this._templating.isHiddenForever(id)) {
+                    return this._templating.getFileContainer(id);
+                }
+            },
+            reset: function() {
+                this._parent.prototype.reset.apply(this, arguments);
+                this._templating.reset();
+                if (!this._options.button && this._templating.getButton()) {
+                    this._defaultButtonId = this._createUploadButton({
+                        element: this._templating.getButton(),
+                        title: this._options.text.fileInputTitle
+                    }).getButtonId();
+                }
+                if (this._dnd) {
+                    this._dnd.dispose();
+                    this._dnd = this._setupDragAndDrop();
+                }
+                this._totalFilesInBatch = 0;
+                this._filesInBatchAddedToUi = 0;
+                this._setupClickAndEditEventHandlers();
+            },
+            setName: function(id, newName) {
+                var formattedFilename = this._options.formatFileName(newName);
+                this._parent.prototype.setName.apply(this, arguments);
+                this._templating.updateFilename(id, formattedFilename);
+            },
+            pauseUpload: function(id) {
+                var paused = this._parent.prototype.pauseUpload.apply(this, arguments);
+                paused && this._templating.uploadPaused(id);
+                return paused;
+            },
+            continueUpload: function(id) {
+                var continued = this._parent.prototype.continueUpload.apply(this, arguments);
+                continued && this._templating.uploadContinued(id);
+                return continued;
+            },
+            getId: function(fileContainerOrChildEl) {
+                return this._templating.getFileId(fileContainerOrChildEl);
+            },
+            getDropTarget: function(fileId) {
+                var file = this.getFile(fileId);
+                return file.qqDropTarget;
+            }
+        };
+        qq.uiPrivateApi = {
+            _getButton: function(buttonId) {
+                var button = this._parent.prototype._getButton.apply(this, arguments);
+                if (!button) {
+                    if (buttonId === this._defaultButtonId) {
+                        button = this._templating.getButton();
+                    }
+                }
+                return button;
+            },
+            _removeFileItem: function(fileId) {
+                this._templating.removeFile(fileId);
+            },
+            _setupClickAndEditEventHandlers: function() {
+                this._fileButtonsClickHandler = qq.FileButtonsClickHandler && this._bindFileButtonsClickEvent();
+                this._focusinEventSupported = !qq.firefox();
+                if (this._isEditFilenameEnabled()) {
+                    this._filenameClickHandler = this._bindFilenameClickEvent();
+                    this._filenameInputFocusInHandler = this._bindFilenameInputFocusInEvent();
+                    this._filenameInputFocusHandler = this._bindFilenameInputFocusEvent();
+                }
+            },
+            _setupDragAndDrop: function() {
+                var self = this, dropZoneElements = this._options.dragAndDrop.extraDropzones, templating = this._templating, defaultDropZone = templating.getDropZone();
+                defaultDropZone && dropZoneElements.push(defaultDropZone);
+                return new qq.DragAndDrop({
+                    dropZoneElements: dropZoneElements,
+                    allowMultipleItems: this._options.multiple,
+                    classes: {
+                        dropActive: this._options.classes.dropActive
+                    },
+                    callbacks: {
+                        processingDroppedFiles: function() {
+                            templating.showDropProcessing();
+                        },
+                        processingDroppedFilesComplete: function(files, targetEl) {
+                            templating.hideDropProcessing();
+                            qq.each(files, function(idx, file) {
+                                file.qqDropTarget = targetEl;
+                            });
+                            if (files.length) {
+                                self.addFiles(files, null, null);
+                            }
+                        },
+                        dropError: function(code, errorData) {
+                            self._itemError(code, errorData);
+                        },
+                        dropLog: function(message, level) {
+                            self.log(message, level);
+                        }
+                    }
+                });
+            },
+            _bindFileButtonsClickEvent: function() {
+                var self = this;
+                return new qq.FileButtonsClickHandler({
+                    templating: this._templating,
+                    log: function(message, lvl) {
+                        self.log(message, lvl);
+                    },
+                    onDeleteFile: function(fileId) {
+                        self.deleteFile(fileId);
+                    },
+                    onCancel: function(fileId) {
+                        self.cancel(fileId);
+                    },
+                    onRetry: function(fileId) {
+                        self.retry(fileId);
+                    },
+                    onPause: function(fileId) {
+                        self.pauseUpload(fileId);
+                    },
+                    onContinue: function(fileId) {
+                        self.continueUpload(fileId);
+                    },
+                    onGetName: function(fileId) {
+                        return self.getName(fileId);
+                    }
+                });
+            },
+            _isEditFilenameEnabled: function() {
+                return this._templating.isEditFilenamePossible() && !this._options.autoUpload && qq.FilenameClickHandler && qq.FilenameInputFocusHandler && qq.FilenameInputFocusHandler;
+            },
+            _filenameEditHandler: function() {
+                var self = this, templating = this._templating;
+                return {
+                    templating: templating,
+                    log: function(message, lvl) {
+                        self.log(message, lvl);
+                    },
+                    onGetUploadStatus: function(fileId) {
+                        return self.getUploads({
+                            id: fileId
+                        }).status;
+                    },
+                    onGetName: function(fileId) {
+                        return self.getName(fileId);
+                    },
+                    onSetName: function(id, newName) {
+                        self.setName(id, newName);
+                    },
+                    onEditingStatusChange: function(id, isEditing) {
+                        var qqInput = qq(templating.getEditInput(id)), qqFileContainer = qq(templating.getFileContainer(id));
+                        if (isEditing) {
+                            qqInput.addClass("qq-editing");
+                            templating.hideFilename(id);
+                            templating.hideEditIcon(id);
+                        } else {
+                            qqInput.removeClass("qq-editing");
+                            templating.showFilename(id);
+                            templating.showEditIcon(id);
+                        }
+                        qqFileContainer.addClass("qq-temp").removeClass("qq-temp");
+                    }
+                };
+            },
+            _onUploadStatusChange: function(id, oldStatus, newStatus) {
+                this._parent.prototype._onUploadStatusChange.apply(this, arguments);
+                if (this._isEditFilenameEnabled()) {
+                    if (this._templating.getFileContainer(id) && newStatus !== qq.status.SUBMITTED) {
+                        this._templating.markFilenameEditable(id);
+                        this._templating.hideEditIcon(id);
+                    }
+                }
+                if (oldStatus === qq.status.UPLOAD_RETRYING && newStatus === qq.status.UPLOADING) {
+                    this._templating.hideRetry(id);
+                    this._templating.setStatusText(id);
+                    qq(this._templating.getFileContainer(id)).removeClass(this._classes.retrying);
+                } else if (newStatus === qq.status.UPLOAD_FAILED) {
+                    this._templating.hidePause(id);
+                }
+            },
+            _bindFilenameInputFocusInEvent: function() {
+                var spec = qq.extend({}, this._filenameEditHandler());
+                return new qq.FilenameInputFocusInHandler(spec);
+            },
+            _bindFilenameInputFocusEvent: function() {
+                var spec = qq.extend({}, this._filenameEditHandler());
+                return new qq.FilenameInputFocusHandler(spec);
+            },
+            _bindFilenameClickEvent: function() {
+                var spec = qq.extend({}, this._filenameEditHandler());
+                return new qq.FilenameClickHandler(spec);
+            },
+            _storeForLater: function(id) {
+                this._parent.prototype._storeForLater.apply(this, arguments);
+                this._templating.hideSpinner(id);
+            },
+            _onAllComplete: function(successful, failed) {
+                this._parent.prototype._onAllComplete.apply(this, arguments);
+                this._templating.resetTotalProgress();
+            },
+            _onSubmit: function(id, name) {
+                var file = this.getFile(id);
+                if (file && file.qqPath && this._options.dragAndDrop.reportDirectoryPaths) {
+                    this._paramsStore.addReadOnly(id, {
+                        qqpath: file.qqPath
+                    });
+                }
+                this._parent.prototype._onSubmit.apply(this, arguments);
+                this._addToList(id, name);
+            },
+            _onSubmitted: function(id) {
+                if (this._isEditFilenameEnabled()) {
+                    this._templating.markFilenameEditable(id);
+                    this._templating.showEditIcon(id);
+                    if (!this._focusinEventSupported) {
+                        this._filenameInputFocusHandler.addHandler(this._templating.getEditInput(id));
+                    }
+                }
+            },
+            _onProgress: function(id, name, loaded, total) {
+                this._parent.prototype._onProgress.apply(this, arguments);
+                this._templating.updateProgress(id, loaded, total);
+                if (total === 0 || Math.round(loaded / total * 100) === 100) {
+                    this._templating.hideCancel(id);
+                    this._templating.hidePause(id);
+                    this._templating.hideProgress(id);
+                    this._templating.setStatusText(id, this._options.text.waitingForResponse);
+                    this._displayFileSize(id);
+                } else {
+                    this._displayFileSize(id, loaded, total);
+                }
+            },
+            _onTotalProgress: function(loaded, total) {
+                this._parent.prototype._onTotalProgress.apply(this, arguments);
+                this._templating.updateTotalProgress(loaded, total);
+            },
+            _onComplete: function(id, name, result, xhr) {
+                var parentRetVal = this._parent.prototype._onComplete.apply(this, arguments), templating = this._templating, fileContainer = templating.getFileContainer(id), self = this;
+                function completeUpload(result) {
+                    if (!fileContainer) {
+                        return;
+                    }
+                    templating.setStatusText(id);
+                    qq(fileContainer).removeClass(self._classes.retrying);
+                    templating.hideProgress(id);
+                    if (self.getUploads({
+                        id: id
+                    }).status !== qq.status.UPLOAD_FAILED) {
+                        templating.hideCancel(id);
+                    }
+                    templating.hideSpinner(id);
+                    if (result.success) {
+                        self._markFileAsSuccessful(id);
+                    } else {
+                        qq(fileContainer).addClass(self._classes.fail);
+                        templating.showCancel(id);
+                        if (templating.isRetryPossible() && !self._preventRetries[id]) {
+                            qq(fileContainer).addClass(self._classes.retryable);
+                            templating.showRetry(id);
+                        }
+                        self._controlFailureTextDisplay(id, result);
+                    }
+                }
+                if (parentRetVal instanceof qq.Promise) {
+                    parentRetVal.done(function(newResult) {
+                        completeUpload(newResult);
+                    });
+                } else {
+                    completeUpload(result);
+                }
+                return parentRetVal;
+            },
+            _markFileAsSuccessful: function(id) {
+                var templating = this._templating;
+                if (this._isDeletePossible()) {
+                    templating.showDeleteButton(id);
+                }
+                qq(templating.getFileContainer(id)).addClass(this._classes.success);
+                this._maybeUpdateThumbnail(id);
+            },
+            _onUploadPrep: function(id) {
+                this._parent.prototype._onUploadPrep.apply(this, arguments);
+                this._templating.showSpinner(id);
+            },
+            _onUpload: function(id, name) {
+                var parentRetVal = this._parent.prototype._onUpload.apply(this, arguments);
+                this._templating.showSpinner(id);
+                return parentRetVal;
+            },
+            _onUploadChunk: function(id, chunkData) {
+                this._parent.prototype._onUploadChunk.apply(this, arguments);
+                if (chunkData.partIndex > 0 && this._handler.isResumable(id)) {
+                    this._templating.allowPause(id);
+                }
+            },
+            _onCancel: function(id, name) {
+                this._parent.prototype._onCancel.apply(this, arguments);
+                this._removeFileItem(id);
+                if (this._getNotFinished() === 0) {
+                    this._templating.resetTotalProgress();
+                }
+            },
+            _onBeforeAutoRetry: function(id) {
+                var retryNumForDisplay, maxAuto, retryNote;
+                this._parent.prototype._onBeforeAutoRetry.apply(this, arguments);
+                this._showCancelLink(id);
+                if (this._options.retry.showAutoRetryNote) {
+                    retryNumForDisplay = this._autoRetries[id];
+                    maxAuto = this._options.retry.maxAutoAttempts;
+                    retryNote = this._options.retry.autoRetryNote.replace(/\{retryNum\}/g, retryNumForDisplay);
+                    retryNote = retryNote.replace(/\{maxAuto\}/g, maxAuto);
+                    this._templating.setStatusText(id, retryNote);
+                    qq(this._templating.getFileContainer(id)).addClass(this._classes.retrying);
+                }
+            },
+            _onBeforeManualRetry: function(id) {
+                if (this._parent.prototype._onBeforeManualRetry.apply(this, arguments)) {
+                    this._templating.resetProgress(id);
+                    qq(this._templating.getFileContainer(id)).removeClass(this._classes.fail);
+                    this._templating.setStatusText(id);
+                    this._templating.showSpinner(id);
+                    this._showCancelLink(id);
+                    return true;
+                } else {
+                    qq(this._templating.getFileContainer(id)).addClass(this._classes.retryable);
+                    this._templating.showRetry(id);
+                    return false;
+                }
+            },
+            _onSubmitDelete: function(id) {
+                var onSuccessCallback = qq.bind(this._onSubmitDeleteSuccess, this);
+                this._parent.prototype._onSubmitDelete.call(this, id, onSuccessCallback);
+            },
+            _onSubmitDeleteSuccess: function(id, uuid, additionalMandatedParams) {
+                if (this._options.deleteFile.forceConfirm) {
+                    this._showDeleteConfirm.apply(this, arguments);
+                } else {
+                    this._sendDeleteRequest.apply(this, arguments);
+                }
+            },
+            _onDeleteComplete: function(id, xhr, isError) {
+                this._parent.prototype._onDeleteComplete.apply(this, arguments);
+                this._templating.hideSpinner(id);
+                if (isError) {
+                    this._templating.setStatusText(id, this._options.deleteFile.deletingFailedText);
+                    this._templating.showDeleteButton(id);
+                } else {
+                    this._removeFileItem(id);
+                }
+            },
+            _sendDeleteRequest: function(id, uuid, additionalMandatedParams) {
+                this._templating.hideDeleteButton(id);
+                this._templating.showSpinner(id);
+                this._templating.setStatusText(id, this._options.deleteFile.deletingStatusText);
+                this._deleteHandler.sendDelete.apply(this, arguments);
+            },
+            _showDeleteConfirm: function(id, uuid, mandatedParams) {
+                var fileName = this.getName(id), confirmMessage = this._options.deleteFile.confirmMessage.replace(/\{filename\}/g, fileName), uuid = this.getUuid(id), deleteRequestArgs = arguments, self = this, retVal;
+                retVal = this._options.showConfirm(confirmMessage);
+                if (qq.isGenericPromise(retVal)) {
+                    retVal.then(function() {
+                        self._sendDeleteRequest.apply(self, deleteRequestArgs);
+                    });
+                } else if (retVal !== false) {
+                    self._sendDeleteRequest.apply(self, deleteRequestArgs);
+                }
+            },
+            _addToList: function(id, name, canned) {
+                var prependData, prependIndex = 0, dontDisplay = this._handler.isProxied(id) && this._options.scaling.hideScaled, record;
+                if (this._options.display.prependFiles) {
+                    if (this._totalFilesInBatch > 1 && this._filesInBatchAddedToUi > 0) {
+                        prependIndex = this._filesInBatchAddedToUi - 1;
+                    }
+                    prependData = {
+                        index: prependIndex
+                    };
+                }
+                if (!canned) {
+                    if (this._options.disableCancelForFormUploads && !qq.supportedFeatures.ajaxUploading) {
+                        this._templating.disableCancel();
+                    }
+                    if (!this._options.multiple) {
+                        record = this.getUploads({
+                            id: id
+                        });
+                        this._handledProxyGroup = this._handledProxyGroup || record.proxyGroupId;
+                        if (record.proxyGroupId !== this._handledProxyGroup || !record.proxyGroupId) {
+                            this._handler.cancelAll();
+                            this._clearList();
+                            this._handledProxyGroup = null;
+                        }
+                    }
+                }
+                if (canned) {
+                    this._templating.addFileToCache(id, this._options.formatFileName(name), prependData, dontDisplay);
+                    this._templating.updateThumbnail(id, this._thumbnailUrls[id], true, this._options.thumbnails.customResizer);
+                } else {
+                    this._templating.addFile(id, this._options.formatFileName(name), prependData, dontDisplay);
+                    this._templating.generatePreview(id, this.getFile(id), this._options.thumbnails.customResizer);
+                }
+                this._filesInBatchAddedToUi += 1;
+                if (canned || this._options.display.fileSizeOnSubmit && qq.supportedFeatures.ajaxUploading) {
+                    this._displayFileSize(id);
+                }
+            },
+            _clearList: function() {
+                this._templating.clearFiles();
+                this.clearStoredFiles();
+            },
+            _displayFileSize: function(id, loadedSize, totalSize) {
+                var size = this.getSize(id), sizeForDisplay = this._formatSize(size);
+                if (size >= 0) {
+                    if (loadedSize !== undefined && totalSize !== undefined) {
+                        sizeForDisplay = this._formatProgress(loadedSize, totalSize);
+                    }
+                    this._templating.updateSize(id, sizeForDisplay);
+                }
+            },
+            _formatProgress: function(uploadedSize, totalSize) {
+                var message = this._options.text.formatProgress;
+                function r(name, replacement) {
+                    message = message.replace(name, replacement);
+                }
+                r("{percent}", Math.round(uploadedSize / totalSize * 100));
+                r("{total_size}", this._formatSize(totalSize));
+                return message;
+            },
+            _controlFailureTextDisplay: function(id, response) {
+                var mode, responseProperty, failureReason;
+                mode = this._options.failedUploadTextDisplay.mode;
+                responseProperty = this._options.failedUploadTextDisplay.responseProperty;
+                if (mode === "custom") {
+                    failureReason = response[responseProperty];
+                    if (!failureReason) {
+                        failureReason = this._options.text.failUpload;
+                    }
+                    this._templating.setStatusText(id, failureReason);
+                    if (this._options.failedUploadTextDisplay.enableTooltip) {
+                        this._showTooltip(id, failureReason);
+                    }
+                } else if (mode === "default") {
+                    this._templating.setStatusText(id, this._options.text.failUpload);
+                } else if (mode !== "none") {
+                    this.log("failedUploadTextDisplay.mode value of '" + mode + "' is not valid", "warn");
+                }
+            },
+            _showTooltip: function(id, text) {
+                this._templating.getFileContainer(id).title = text;
+            },
+            _showCancelLink: function(id) {
+                if (!this._options.disableCancelForFormUploads || qq.supportedFeatures.ajaxUploading) {
+                    this._templating.showCancel(id);
+                }
+            },
+            _itemError: function(code, name, item) {
+                var message = this._parent.prototype._itemError.apply(this, arguments);
+                this._options.showMessage(message);
+            },
+            _batchError: function(message) {
+                this._parent.prototype._batchError.apply(this, arguments);
+                this._options.showMessage(message);
+            },
+            _setupPastePrompt: function() {
+                var self = this;
+                this._options.callbacks.onPasteReceived = function() {
+                    var message = self._options.paste.namePromptMessage, defaultVal = self._options.paste.defaultName;
+                    return self._options.showPrompt(message, defaultVal);
+                };
+            },
+            _fileOrBlobRejected: function(id, name) {
+                this._totalFilesInBatch -= 1;
+                this._parent.prototype._fileOrBlobRejected.apply(this, arguments);
+            },
+            _prepareItemsForUpload: function(items, params, endpoint) {
+                this._totalFilesInBatch = items.length;
+                this._filesInBatchAddedToUi = 0;
+                this._parent.prototype._prepareItemsForUpload.apply(this, arguments);
+            },
+            _maybeUpdateThumbnail: function(fileId) {
+                var thumbnailUrl = this._thumbnailUrls[fileId], fileStatus = this.getUploads({
+                    id: fileId
+                }).status;
+                if (fileStatus !== qq.status.DELETED && (thumbnailUrl || this._options.thumbnails.placeholders.waitUntilResponse || !qq.supportedFeatures.imagePreviews)) {
+                    this._templating.updateThumbnail(fileId, thumbnailUrl, this._options.thumbnails.customResizer);
+                }
+            },
+            _addCannedFile: function(sessionData) {
+                var id = this._parent.prototype._addCannedFile.apply(this, arguments);
+                this._addToList(id, this.getName(id), true);
+                this._templating.hideSpinner(id);
+                this._templating.hideCancel(id);
+                this._markFileAsSuccessful(id);
+                return id;
+            },
+            _setSize: function(id, newSize) {
+                this._parent.prototype._setSize.apply(this, arguments);
+                this._templating.updateSize(id, this._formatSize(newSize));
+            },
+            _sessionRequestComplete: function() {
+                this._templating.addCacheToDom();
+                this._parent.prototype._sessionRequestComplete.apply(this, arguments);
+            }
+        };
+    })();
+    qq.FineUploader = function(o, namespace) {
+        "use strict";
+        var self = this;
+        this._parent = namespace ? qq[namespace].FineUploaderBasic : qq.FineUploaderBasic;
+        this._parent.apply(this, arguments);
+        qq.extend(this._options, {
+            element: null,
+            button: null,
+            listElement: null,
+            dragAndDrop: {
+                extraDropzones: [],
+                reportDirectoryPaths: false
+            },
+            text: {
+                formatProgress: "{percent}% of {total_size}",
+                failUpload: "Upload failed",
+                waitingForResponse: "Processing...",
+                paused: "Paused"
+            },
+            template: "qq-template",
+            classes: {
+                retrying: "qq-upload-retrying",
+                retryable: "qq-upload-retryable",
+                success: "qq-upload-success",
+                fail: "qq-upload-fail",
+                editable: "qq-editable",
+                hide: "qq-hide",
+                dropActive: "qq-upload-drop-area-active"
+            },
+            failedUploadTextDisplay: {
+                mode: "default",
+                responseProperty: "error",
+                enableTooltip: true
+            },
+            messages: {
+                tooManyFilesError: "You may only drop one file",
+                unsupportedBrowser: "Unrecoverable error - this browser does not permit file uploading of any kind."
+            },
+            retry: {
+                showAutoRetryNote: true,
+                autoRetryNote: "Retrying {retryNum}/{maxAuto}..."
+            },
+            deleteFile: {
+                forceConfirm: false,
+                confirmMessage: "Are you sure you want to delete {filename}?",
+                deletingStatusText: "Deleting...",
+                deletingFailedText: "Delete failed"
+            },
+            display: {
+                fileSizeOnSubmit: false,
+                prependFiles: false
+            },
+            paste: {
+                promptForName: false,
+                namePromptMessage: "Please name this image"
+            },
+            thumbnails: {
+                customResizer: null,
+                maxCount: 0,
+                placeholders: {
+                    waitUntilResponse: false,
+                    notAvailablePath: null,
+                    waitingPath: null
+                },
+                timeBetweenThumbs: 750
+            },
+            scaling: {
+                hideScaled: false
+            },
+            showMessage: function(message) {
+                if (self._templating.hasDialog("alert")) {
+                    return self._templating.showDialog("alert", message);
+                } else {
+                    setTimeout(function() {
+                        window.alert(message);
+                    }, 0);
+                }
+            },
+            showConfirm: function(message) {
+                if (self._templating.hasDialog("confirm")) {
+                    return self._templating.showDialog("confirm", message);
+                } else {
+                    return window.confirm(message);
+                }
+            },
+            showPrompt: function(message, defaultValue) {
+                if (self._templating.hasDialog("prompt")) {
+                    return self._templating.showDialog("prompt", message, defaultValue);
+                } else {
+                    return window.prompt(message, defaultValue);
+                }
+            }
+        }, true);
+        qq.extend(this._options, o, true);
+        this._templating = new qq.Templating({
+            log: qq.bind(this.log, this),
+            templateIdOrEl: this._options.template,
+            containerEl: this._options.element,
+            fileContainerEl: this._options.listElement,
+            button: this._options.button,
+            imageGenerator: this._imageGenerator,
+            classes: {
+                hide: this._options.classes.hide,
+                editable: this._options.classes.editable
+            },
+            limits: {
+                maxThumbs: this._options.thumbnails.maxCount,
+                timeBetweenThumbs: this._options.thumbnails.timeBetweenThumbs
+            },
+            placeholders: {
+                waitUntilUpdate: this._options.thumbnails.placeholders.waitUntilResponse,
+                thumbnailNotAvailable: this._options.thumbnails.placeholders.notAvailablePath,
+                waitingForThumbnail: this._options.thumbnails.placeholders.waitingPath
+            },
+            text: this._options.text
+        });
+        if (this._options.workarounds.ios8SafariUploads && qq.ios800() && qq.iosSafari()) {
+            this._templating.renderFailure(this._options.messages.unsupportedBrowserIos8Safari);
+        } else if (!qq.supportedFeatures.uploading || this._options.cors.expected && !qq.supportedFeatures.uploadCors) {
+            this._templating.renderFailure(this._options.messages.unsupportedBrowser);
+        } else {
+            this._wrapCallbacks();
+            this._templating.render();
+            this._classes = this._options.classes;
+            if (!this._options.button && this._templating.getButton()) {
+                this._defaultButtonId = this._createUploadButton({
+                    element: this._templating.getButton(),
+                    title: this._options.text.fileInputTitle
+                }).getButtonId();
+            }
+            this._setupClickAndEditEventHandlers();
+            if (qq.DragAndDrop && qq.supportedFeatures.fileDrop) {
+                this._dnd = this._setupDragAndDrop();
+            }
+            if (this._options.paste.targetElement && this._options.paste.promptForName) {
+                if (qq.PasteSupport) {
+                    this._setupPastePrompt();
+                } else {
+                    this.log("Paste support module not found.", "error");
+                }
+            }
+            this._totalFilesInBatch = 0;
+            this._filesInBatchAddedToUi = 0;
+        }
+    };
+    qq.extend(qq.FineUploader.prototype, qq.basePublicApi);
+    qq.extend(qq.FineUploader.prototype, qq.basePrivateApi);
+    qq.extend(qq.FineUploader.prototype, qq.uiPublicApi);
+    qq.extend(qq.FineUploader.prototype, qq.uiPrivateApi);
+    qq.Templating = function(spec) {
+        "use strict";
+        var FILE_ID_ATTR = "qq-file-id", FILE_CLASS_PREFIX = "qq-file-id-", THUMBNAIL_MAX_SIZE_ATTR = "qq-max-size", THUMBNAIL_SERVER_SCALE_ATTR = "qq-server-scale", HIDE_DROPZONE_ATTR = "qq-hide-dropzone", DROPZPONE_TEXT_ATTR = "qq-drop-area-text", IN_PROGRESS_CLASS = "qq-in-progress", HIDDEN_FOREVER_CLASS = "qq-hidden-forever", fileBatch = {
+            content: document.createDocumentFragment(),
+            map: {}
+        }, isCancelDisabled = false, generatedThumbnails = 0, thumbnailQueueMonitorRunning = false, thumbGenerationQueue = [], thumbnailMaxSize = -1, options = {
+            log: null,
+            limits: {
+                maxThumbs: 0,
+                timeBetweenThumbs: 750
+            },
+            templateIdOrEl: "qq-template",
+            containerEl: null,
+            fileContainerEl: null,
+            button: null,
+            imageGenerator: null,
+            classes: {
+                hide: "qq-hide",
+                editable: "qq-editable"
+            },
+            placeholders: {
+                waitUntilUpdate: false,
+                thumbnailNotAvailable: null,
+                waitingForThumbnail: null
+            },
+            text: {
+                paused: "Paused"
+            }
+        }, selectorClasses = {
+            button: "qq-upload-button-selector",
+            alertDialog: "qq-alert-dialog-selector",
+            dialogCancelButton: "qq-cancel-button-selector",
+            confirmDialog: "qq-confirm-dialog-selector",
+            dialogMessage: "qq-dialog-message-selector",
+            dialogOkButton: "qq-ok-button-selector",
+            promptDialog: "qq-prompt-dialog-selector",
+            uploader: "qq-uploader-selector",
+            drop: "qq-upload-drop-area-selector",
+            list: "qq-upload-list-selector",
+            progressBarContainer: "qq-progress-bar-container-selector",
+            progressBar: "qq-progress-bar-selector",
+            totalProgressBarContainer: "qq-total-progress-bar-container-selector",
+            totalProgressBar: "qq-total-progress-bar-selector",
+            file: "qq-upload-file-selector",
+            spinner: "qq-upload-spinner-selector",
+            size: "qq-upload-size-selector",
+            cancel: "qq-upload-cancel-selector",
+            pause: "qq-upload-pause-selector",
+            continueButton: "qq-upload-continue-selector",
+            deleteButton: "qq-upload-delete-selector",
+            retry: "qq-upload-retry-selector",
+            statusText: "qq-upload-status-text-selector",
+            editFilenameInput: "qq-edit-filename-selector",
+            editNameIcon: "qq-edit-filename-icon-selector",
+            dropText: "qq-upload-drop-area-text-selector",
+            dropProcessing: "qq-drop-processing-selector",
+            dropProcessingSpinner: "qq-drop-processing-spinner-selector",
+            thumbnail: "qq-thumbnail-selector"
+        }, previewGeneration = {}, cachedThumbnailNotAvailableImg = new qq.Promise(), cachedWaitingForThumbnailImg = new qq.Promise(), log, isEditElementsExist, isRetryElementExist, templateDom, container, fileList, showThumbnails, serverScale, cacheThumbnailPlaceholders = function() {
+            var notAvailableUrl = options.placeholders.thumbnailNotAvailable, waitingUrl = options.placeholders.waitingForThumbnail, spec = {
+                maxSize: thumbnailMaxSize,
+                scale: serverScale
+            };
+            if (showThumbnails) {
+                if (notAvailableUrl) {
+                    options.imageGenerator.generate(notAvailableUrl, new Image(), spec).then(function(updatedImg) {
+                        cachedThumbnailNotAvailableImg.success(updatedImg);
+                    }, function() {
+                        cachedThumbnailNotAvailableImg.failure();
+                        log("Problem loading 'not available' placeholder image at " + notAvailableUrl, "error");
+                    });
+                } else {
+                    cachedThumbnailNotAvailableImg.failure();
+                }
+                if (waitingUrl) {
+                    options.imageGenerator.generate(waitingUrl, new Image(), spec).then(function(updatedImg) {
+                        cachedWaitingForThumbnailImg.success(updatedImg);
+                    }, function() {
+                        cachedWaitingForThumbnailImg.failure();
+                        log("Problem loading 'waiting for thumbnail' placeholder image at " + waitingUrl, "error");
+                    });
+                } else {
+                    cachedWaitingForThumbnailImg.failure();
+                }
+            }
+        }, displayWaitingImg = function(thumbnail) {
+            var waitingImgPlacement = new qq.Promise();
+            cachedWaitingForThumbnailImg.then(function(img) {
+                maybeScalePlaceholderViaCss(img, thumbnail);
+                if (!thumbnail.src) {
+                    thumbnail.src = img.src;
+                    thumbnail.onload = function() {
+                        thumbnail.onload = null;
+                        show(thumbnail);
+                        waitingImgPlacement.success();
+                    };
+                } else {
+                    waitingImgPlacement.success();
+                }
+            }, function() {
+                hide(thumbnail);
+                waitingImgPlacement.success();
+            });
+            return waitingImgPlacement;
+        }, generateNewPreview = function(id, blob, spec) {
+            var thumbnail = getThumbnail(id);
+            log("Generating new thumbnail for " + id);
+            blob.qqThumbnailId = id;
+            return options.imageGenerator.generate(blob, thumbnail, spec).then(function() {
+                generatedThumbnails++;
+                show(thumbnail);
+                previewGeneration[id].success();
+            }, function() {
+                previewGeneration[id].failure();
+                if (!options.placeholders.waitUntilUpdate) {
+                    maybeSetDisplayNotAvailableImg(id, thumbnail);
+                }
+            });
+        }, generateNextQueuedPreview = function() {
+            if (thumbGenerationQueue.length) {
+                thumbnailQueueMonitorRunning = true;
+                var queuedThumbRequest = thumbGenerationQueue.shift();
+                if (queuedThumbRequest.update) {
+                    processUpdateQueuedPreviewRequest(queuedThumbRequest);
+                } else {
+                    processNewQueuedPreviewRequest(queuedThumbRequest);
+                }
+            } else {
+                thumbnailQueueMonitorRunning = false;
+            }
+        }, getCancel = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.cancel);
+        }, getContinue = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.continueButton);
+        }, getDialog = function(type) {
+            return getTemplateEl(container, selectorClasses[type + "Dialog"]);
+        }, getDelete = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.deleteButton);
+        }, getDropProcessing = function() {
+            return getTemplateEl(container, selectorClasses.dropProcessing);
+        }, getEditIcon = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.editNameIcon);
+        }, getFile = function(id) {
+            return fileBatch.map[id] || qq(fileList).getFirstByClass(FILE_CLASS_PREFIX + id);
+        }, getFilename = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.file);
+        }, getPause = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.pause);
+        }, getProgress = function(id) {
+            if (id == null) {
+                return getTemplateEl(container, selectorClasses.totalProgressBarContainer) || getTemplateEl(container, selectorClasses.totalProgressBar);
+            }
+            return getTemplateEl(getFile(id), selectorClasses.progressBarContainer) || getTemplateEl(getFile(id), selectorClasses.progressBar);
+        }, getRetry = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.retry);
+        }, getSize = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.size);
+        }, getSpinner = function(id) {
+            return getTemplateEl(getFile(id), selectorClasses.spinner);
+        }, getTemplateEl = function(context, cssClass) {
+            return context && qq(context).getFirstByClass(cssClass);
+        }, getThumbnail = function(id) {
+            return showThumbnails && getTemplateEl(getFile(id), selectorClasses.thumbnail);
+        }, hide = function(el) {
+            el && qq(el).addClass(options.classes.hide);
+        }, maybeScalePlaceholderViaCss = function(placeholder, thumbnail) {
+            var maxWidth = placeholder.style.maxWidth, maxHeight = placeholder.style.maxHeight;
+            if (maxHeight && maxWidth && !thumbnail.style.maxWidth && !thumbnail.style.maxHeight) {
+                qq(thumbnail).css({
+                    maxWidth: maxWidth,
+                    maxHeight: maxHeight
+                });
+            }
+        }, maybeSetDisplayNotAvailableImg = function(id, thumbnail) {
+            var previewing = previewGeneration[id] || new qq.Promise().failure(), notAvailableImgPlacement = new qq.Promise();
+            cachedThumbnailNotAvailableImg.then(function(img) {
+                previewing.then(function() {
+                    notAvailableImgPlacement.success();
+                }, function() {
+                    maybeScalePlaceholderViaCss(img, thumbnail);
+                    thumbnail.onload = function() {
+                        thumbnail.onload = null;
+                        notAvailableImgPlacement.success();
+                    };
+                    thumbnail.src = img.src;
+                    show(thumbnail);
+                });
+            });
+            return notAvailableImgPlacement;
+        }, parseAndGetTemplate = function() {
+            var scriptEl, scriptHtml, fileListNode, tempTemplateEl, fileListEl, defaultButton, dropArea, thumbnail, dropProcessing, dropTextEl, uploaderEl;
+            log("Parsing template");
+            if (options.templateIdOrEl == null) {
+                throw new Error("You MUST specify either a template element or ID!");
+            }
+            if (qq.isString(options.templateIdOrEl)) {
+                scriptEl = document.getElementById(options.templateIdOrEl);
+                if (scriptEl === null) {
+                    throw new Error(qq.format("Cannot find template script at ID '{}'!", options.templateIdOrEl));
+                }
+                scriptHtml = scriptEl.innerHTML;
+            } else {
+                if (options.templateIdOrEl.innerHTML === undefined) {
+                    throw new Error("You have specified an invalid value for the template option!  " + "It must be an ID or an Element.");
+                }
+                scriptHtml = options.templateIdOrEl.innerHTML;
+            }
+            scriptHtml = qq.trimStr(scriptHtml);
+            tempTemplateEl = document.createElement("div");
+            tempTemplateEl.appendChild(qq.toElement(scriptHtml));
+            uploaderEl = qq(tempTemplateEl).getFirstByClass(selectorClasses.uploader);
+            if (options.button) {
+                defaultButton = qq(tempTemplateEl).getFirstByClass(selectorClasses.button);
+                if (defaultButton) {
+                    qq(defaultButton).remove();
+                }
+            }
+            if (!qq.DragAndDrop || !qq.supportedFeatures.fileDrop) {
+                dropProcessing = qq(tempTemplateEl).getFirstByClass(selectorClasses.dropProcessing);
+                if (dropProcessing) {
+                    qq(dropProcessing).remove();
+                }
+            }
+            dropArea = qq(tempTemplateEl).getFirstByClass(selectorClasses.drop);
+            if (dropArea && !qq.DragAndDrop) {
+                log("DnD module unavailable.", "info");
+                qq(dropArea).remove();
+            }
+            if (!qq.supportedFeatures.fileDrop) {
+                uploaderEl.removeAttribute(DROPZPONE_TEXT_ATTR);
+                if (dropArea && qq(dropArea).hasAttribute(HIDE_DROPZONE_ATTR)) {
+                    qq(dropArea).css({
+                        display: "none"
+                    });
+                }
+            } else if (qq(uploaderEl).hasAttribute(DROPZPONE_TEXT_ATTR) && dropArea) {
+                dropTextEl = qq(dropArea).getFirstByClass(selectorClasses.dropText);
+                dropTextEl && qq(dropTextEl).remove();
+            }
+            thumbnail = qq(tempTemplateEl).getFirstByClass(selectorClasses.thumbnail);
+            if (!showThumbnails) {
+                thumbnail && qq(thumbnail).remove();
+            } else if (thumbnail) {
+                thumbnailMaxSize = parseInt(thumbnail.getAttribute(THUMBNAIL_MAX_SIZE_ATTR));
+                thumbnailMaxSize = thumbnailMaxSize > 0 ? thumbnailMaxSize : null;
+                serverScale = qq(thumbnail).hasAttribute(THUMBNAIL_SERVER_SCALE_ATTR);
+            }
+            showThumbnails = showThumbnails && thumbnail;
+            isEditElementsExist = qq(tempTemplateEl).getByClass(selectorClasses.editFilenameInput).length > 0;
+            isRetryElementExist = qq(tempTemplateEl).getByClass(selectorClasses.retry).length > 0;
+            fileListNode = qq(tempTemplateEl).getFirstByClass(selectorClasses.list);
+            if (fileListNode == null) {
+                throw new Error("Could not find the file list container in the template!");
+            }
+            fileListEl = fileListNode.children[0].cloneNode(true);
+            fileListNode.innerHTML = "";
+            if (tempTemplateEl.getElementsByTagName("DIALOG").length) {
+                document.createElement("dialog");
+            }
+            log("Template parsing complete");
+            return {
+                template: tempTemplateEl,
+                fileTemplate: fileListEl
+            };
+        }, prependFile = function(el, index, fileList) {
+            var parentEl = fileList, beforeEl = parentEl.firstChild;
+            if (index > 0) {
+                beforeEl = qq(parentEl).children()[index].nextSibling;
+            }
+            parentEl.insertBefore(el, beforeEl);
+        }, processNewQueuedPreviewRequest = function(queuedThumbRequest) {
+            var id = queuedThumbRequest.id, optFileOrBlob = queuedThumbRequest.optFileOrBlob, relatedThumbnailId = optFileOrBlob && optFileOrBlob.qqThumbnailId, thumbnail = getThumbnail(id), spec = {
+                customResizeFunction: queuedThumbRequest.customResizeFunction,
+                maxSize: thumbnailMaxSize,
+                orient: true,
+                scale: true
+            };
+            if (qq.supportedFeatures.imagePreviews) {
+                if (thumbnail) {
+                    if (options.limits.maxThumbs && options.limits.maxThumbs <= generatedThumbnails) {
+                        maybeSetDisplayNotAvailableImg(id, thumbnail);
+                        generateNextQueuedPreview();
+                    } else {
+                        displayWaitingImg(thumbnail).done(function() {
+                            previewGeneration[id] = new qq.Promise();
+                            previewGeneration[id].done(function() {
+                                setTimeout(generateNextQueuedPreview, options.limits.timeBetweenThumbs);
+                            });
+                            if (relatedThumbnailId != null) {
+                                useCachedPreview(id, relatedThumbnailId);
+                            } else {
+                                generateNewPreview(id, optFileOrBlob, spec);
+                            }
+                        });
+                    }
+                } else {
+                    generateNextQueuedPreview();
+                }
+            } else if (thumbnail) {
+                displayWaitingImg(thumbnail);
+                generateNextQueuedPreview();
+            }
+        }, processUpdateQueuedPreviewRequest = function(queuedThumbRequest) {
+            var id = queuedThumbRequest.id, thumbnailUrl = queuedThumbRequest.thumbnailUrl, showWaitingImg = queuedThumbRequest.showWaitingImg, thumbnail = getThumbnail(id), spec = {
+                customResizeFunction: queuedThumbRequest.customResizeFunction,
+                scale: serverScale,
+                maxSize: thumbnailMaxSize
+            };
+            if (thumbnail) {
+                if (thumbnailUrl) {
+                    if (options.limits.maxThumbs && options.limits.maxThumbs <= generatedThumbnails) {
+                        maybeSetDisplayNotAvailableImg(id, thumbnail);
+                        generateNextQueuedPreview();
+                    } else {
+                        if (showWaitingImg) {
+                            displayWaitingImg(thumbnail);
+                        }
+                        return options.imageGenerator.generate(thumbnailUrl, thumbnail, spec).then(function() {
+                            show(thumbnail);
+                            generatedThumbnails++;
+                            setTimeout(generateNextQueuedPreview, options.limits.timeBetweenThumbs);
+                        }, function() {
+                            maybeSetDisplayNotAvailableImg(id, thumbnail);
+                            setTimeout(generateNextQueuedPreview, options.limits.timeBetweenThumbs);
+                        });
+                    }
+                } else {
+                    maybeSetDisplayNotAvailableImg(id, thumbnail);
+                    generateNextQueuedPreview();
+                }
+            }
+        }, setProgressBarWidth = function(id, percent) {
+            var bar = getProgress(id), progressBarSelector = id == null ? selectorClasses.totalProgressBar : selectorClasses.progressBar;
+            if (bar && !qq(bar).hasClass(progressBarSelector)) {
+                bar = qq(bar).getFirstByClass(progressBarSelector);
+            }
+            if (bar) {
+                qq(bar).css({
+                    width: percent + "%"
+                });
+                bar.setAttribute("aria-valuenow", percent);
+            }
+        }, show = function(el) {
+            el && qq(el).removeClass(options.classes.hide);
+        }, useCachedPreview = function(targetThumbnailId, cachedThumbnailId) {
+            var targetThumbnail = getThumbnail(targetThumbnailId), cachedThumbnail = getThumbnail(cachedThumbnailId);
+            log(qq.format("ID {} is the same file as ID {}.  Will use generated thumbnail from ID {} instead.", targetThumbnailId, cachedThumbnailId, cachedThumbnailId));
+            previewGeneration[cachedThumbnailId].then(function() {
+                generatedThumbnails++;
+                previewGeneration[targetThumbnailId].success();
+                log(qq.format("Now using previously generated thumbnail created for ID {} on ID {}.", cachedThumbnailId, targetThumbnailId));
+                targetThumbnail.src = cachedThumbnail.src;
+                show(targetThumbnail);
+            }, function() {
+                previewGeneration[targetThumbnailId].failure();
+                if (!options.placeholders.waitUntilUpdate) {
+                    maybeSetDisplayNotAvailableImg(targetThumbnailId, targetThumbnail);
+                }
+            });
+        };
+        qq.extend(options, spec);
+        log = options.log;
+        if (!qq.supportedFeatures.imagePreviews) {
+            options.limits.timeBetweenThumbs = 0;
+            options.limits.maxThumbs = 0;
+        }
+        container = options.containerEl;
+        showThumbnails = options.imageGenerator !== undefined;
+        templateDom = parseAndGetTemplate();
+        cacheThumbnailPlaceholders();
+        qq.extend(this, {
+            render: function() {
+                log("Rendering template in DOM.");
+                generatedThumbnails = 0;
+                container.appendChild(templateDom.template.cloneNode(true));
+                hide(getDropProcessing());
+                this.hideTotalProgress();
+                fileList = options.fileContainerEl || getTemplateEl(container, selectorClasses.list);
+                log("Template rendering complete");
+            },
+            renderFailure: function(message) {
+                var cantRenderEl = qq.toElement(message);
+                container.innerHTML = "";
+                container.appendChild(cantRenderEl);
+            },
+            reset: function() {
+                this.render();
+            },
+            clearFiles: function() {
+                fileList.innerHTML = "";
+            },
+            disableCancel: function() {
+                isCancelDisabled = true;
+            },
+            addFile: function(id, name, prependInfo, hideForever, batch) {
+                var fileEl = templateDom.fileTemplate.cloneNode(true), fileNameEl = getTemplateEl(fileEl, selectorClasses.file), uploaderEl = getTemplateEl(container, selectorClasses.uploader), fileContainer = batch ? fileBatch.content : fileList, thumb;
+                if (batch) {
+                    fileBatch.map[id] = fileEl;
+                }
+                qq(fileEl).addClass(FILE_CLASS_PREFIX + id);
+                uploaderEl.removeAttribute(DROPZPONE_TEXT_ATTR);
+                if (fileNameEl) {
+                    qq(fileNameEl).setText(name);
+                    fileNameEl.setAttribute("title", name);
+                }
+                fileEl.setAttribute(FILE_ID_ATTR, id);
+                if (prependInfo) {
+                    prependFile(fileEl, prependInfo.index, fileContainer);
+                } else {
+                    fileContainer.appendChild(fileEl);
+                }
+                if (hideForever) {
+                    fileEl.style.display = "none";
+                    qq(fileEl).addClass(HIDDEN_FOREVER_CLASS);
+                } else {
+                    hide(getProgress(id));
+                    hide(getSize(id));
+                    hide(getDelete(id));
+                    hide(getRetry(id));
+                    hide(getPause(id));
+                    hide(getContinue(id));
+                    if (isCancelDisabled) {
+                        this.hideCancel(id);
+                    }
+                    thumb = getThumbnail(id);
+                    if (thumb && !thumb.src) {
+                        cachedWaitingForThumbnailImg.then(function(waitingImg) {
+                            thumb.src = waitingImg.src;
+                            if (waitingImg.style.maxHeight && waitingImg.style.maxWidth) {
+                                qq(thumb).css({
+                                    maxHeight: waitingImg.style.maxHeight,
+                                    maxWidth: waitingImg.style.maxWidth
+                                });
+                            }
+                            show(thumb);
+                        });
+                    }
+                }
+            },
+            addFileToCache: function(id, name, prependInfo, hideForever) {
+                this.addFile(id, name, prependInfo, hideForever, true);
+            },
+            addCacheToDom: function() {
+                fileList.appendChild(fileBatch.content);
+                fileBatch.content = document.createDocumentFragment();
+                fileBatch.map = {};
+            },
+            removeFile: function(id) {
+                qq(getFile(id)).remove();
+            },
+            getFileId: function(el) {
+                var currentNode = el;
+                if (currentNode) {
+                    while (currentNode.getAttribute(FILE_ID_ATTR) == null) {
+                        currentNode = currentNode.parentNode;
+                    }
+                    return parseInt(currentNode.getAttribute(FILE_ID_ATTR));
+                }
+            },
+            getFileList: function() {
+                return fileList;
+            },
+            markFilenameEditable: function(id) {
+                var filename = getFilename(id);
+                filename && qq(filename).addClass(options.classes.editable);
+            },
+            updateFilename: function(id, name) {
+                var filenameEl = getFilename(id);
+                if (filenameEl) {
+                    qq(filenameEl).setText(name);
+                    filenameEl.setAttribute("title", name);
+                }
+            },
+            hideFilename: function(id) {
+                hide(getFilename(id));
+            },
+            showFilename: function(id) {
+                show(getFilename(id));
+            },
+            isFileName: function(el) {
+                return qq(el).hasClass(selectorClasses.file);
+            },
+            getButton: function() {
+                return options.button || getTemplateEl(container, selectorClasses.button);
+            },
+            hideDropProcessing: function() {
+                hide(getDropProcessing());
+            },
+            showDropProcessing: function() {
+                show(getDropProcessing());
+            },
+            getDropZone: function() {
+                return getTemplateEl(container, selectorClasses.drop);
+            },
+            isEditFilenamePossible: function() {
+                return isEditElementsExist;
+            },
+            hideRetry: function(id) {
+                hide(getRetry(id));
+            },
+            isRetryPossible: function() {
+                return isRetryElementExist;
+            },
+            showRetry: function(id) {
+                show(getRetry(id));
+            },
+            getFileContainer: function(id) {
+                return getFile(id);
+            },
+            showEditIcon: function(id) {
+                var icon = getEditIcon(id);
+                icon && qq(icon).addClass(options.classes.editable);
+            },
+            isHiddenForever: function(id) {
+                return qq(getFile(id)).hasClass(HIDDEN_FOREVER_CLASS);
+            },
+            hideEditIcon: function(id) {
+                var icon = getEditIcon(id);
+                icon && qq(icon).removeClass(options.classes.editable);
+            },
+            isEditIcon: function(el) {
+                return qq(el).hasClass(selectorClasses.editNameIcon, true);
+            },
+            getEditInput: function(id) {
+                return getTemplateEl(getFile(id), selectorClasses.editFilenameInput);
+            },
+            isEditInput: function(el) {
+                return qq(el).hasClass(selectorClasses.editFilenameInput, true);
+            },
+            updateProgress: function(id, loaded, total) {
+                var bar = getProgress(id), percent;
+                if (bar && total > 0) {
+                    percent = Math.round(loaded / total * 100);
+                    if (percent === 100) {
+                        hide(bar);
+                    } else {
+                        show(bar);
+                    }
+                    setProgressBarWidth(id, percent);
+                }
+            },
+            updateTotalProgress: function(loaded, total) {
+                this.updateProgress(null, loaded, total);
+            },
+            hideProgress: function(id) {
+                var bar = getProgress(id);
+                bar && hide(bar);
+            },
+            hideTotalProgress: function() {
+                this.hideProgress();
+            },
+            resetProgress: function(id) {
+                setProgressBarWidth(id, 0);
+                this.hideTotalProgress(id);
+            },
+            resetTotalProgress: function() {
+                this.resetProgress();
+            },
+            showCancel: function(id) {
+                if (!isCancelDisabled) {
+                    var cancel = getCancel(id);
+                    cancel && qq(cancel).removeClass(options.classes.hide);
+                }
+            },
+            hideCancel: function(id) {
+                hide(getCancel(id));
+            },
+            isCancel: function(el) {
+                return qq(el).hasClass(selectorClasses.cancel, true);
+            },
+            allowPause: function(id) {
+                show(getPause(id));
+                hide(getContinue(id));
+            },
+            uploadPaused: function(id) {
+                this.setStatusText(id, options.text.paused);
+                this.allowContinueButton(id);
+                hide(getSpinner(id));
+            },
+            hidePause: function(id) {
+                hide(getPause(id));
+            },
+            isPause: function(el) {
+                return qq(el).hasClass(selectorClasses.pause, true);
+            },
+            isContinueButton: function(el) {
+                return qq(el).hasClass(selectorClasses.continueButton, true);
+            },
+            allowContinueButton: function(id) {
+                show(getContinue(id));
+                hide(getPause(id));
+            },
+            uploadContinued: function(id) {
+                this.setStatusText(id, "");
+                this.allowPause(id);
+                show(getSpinner(id));
+            },
+            showDeleteButton: function(id) {
+                show(getDelete(id));
+            },
+            hideDeleteButton: function(id) {
+                hide(getDelete(id));
+            },
+            isDeleteButton: function(el) {
+                return qq(el).hasClass(selectorClasses.deleteButton, true);
+            },
+            isRetry: function(el) {
+                return qq(el).hasClass(selectorClasses.retry, true);
+            },
+            updateSize: function(id, text) {
+                var size = getSize(id);
+                if (size) {
+                    show(size);
+                    qq(size).setText(text);
+                }
+            },
+            setStatusText: function(id, text) {
+                var textEl = getTemplateEl(getFile(id), selectorClasses.statusText);
+                if (textEl) {
+                    if (text == null) {
+                        qq(textEl).clearText();
+                    } else {
+                        qq(textEl).setText(text);
+                    }
+                }
+            },
+            hideSpinner: function(id) {
+                qq(getFile(id)).removeClass(IN_PROGRESS_CLASS);
+                hide(getSpinner(id));
+            },
+            showSpinner: function(id) {
+                qq(getFile(id)).addClass(IN_PROGRESS_CLASS);
+                show(getSpinner(id));
+            },
+            generatePreview: function(id, optFileOrBlob, customResizeFunction) {
+                if (!this.isHiddenForever(id)) {
+                    thumbGenerationQueue.push({
+                        id: id,
+                        customResizeFunction: customResizeFunction,
+                        optFileOrBlob: optFileOrBlob
+                    });
+                    !thumbnailQueueMonitorRunning && generateNextQueuedPreview();
+                }
+            },
+            updateThumbnail: function(id, thumbnailUrl, showWaitingImg, customResizeFunction) {
+                if (!this.isHiddenForever(id)) {
+                    thumbGenerationQueue.push({
+                        customResizeFunction: customResizeFunction,
+                        update: true,
+                        id: id,
+                        thumbnailUrl: thumbnailUrl,
+                        showWaitingImg: showWaitingImg
+                    });
+                    !thumbnailQueueMonitorRunning && generateNextQueuedPreview();
+                }
+            },
+            hasDialog: function(type) {
+                return qq.supportedFeatures.dialogElement && !!getDialog(type);
+            },
+            showDialog: function(type, message, defaultValue) {
+                var dialog = getDialog(type), messageEl = getTemplateEl(dialog, selectorClasses.dialogMessage), inputEl = dialog.getElementsByTagName("INPUT")[0], cancelBtn = getTemplateEl(dialog, selectorClasses.dialogCancelButton), okBtn = getTemplateEl(dialog, selectorClasses.dialogOkButton), promise = new qq.Promise(), closeHandler = function() {
+                    cancelBtn.removeEventListener("click", cancelClickHandler);
+                    okBtn && okBtn.removeEventListener("click", okClickHandler);
+                    promise.failure();
+                }, cancelClickHandler = function() {
+                    cancelBtn.removeEventListener("click", cancelClickHandler);
+                    dialog.close();
+                }, okClickHandler = function() {
+                    dialog.removeEventListener("close", closeHandler);
+                    okBtn.removeEventListener("click", okClickHandler);
+                    dialog.close();
+                    promise.success(inputEl && inputEl.value);
+                };
+                dialog.addEventListener("close", closeHandler);
+                cancelBtn.addEventListener("click", cancelClickHandler);
+                okBtn && okBtn.addEventListener("click", okClickHandler);
+                if (inputEl) {
+                    inputEl.value = defaultValue;
+                }
+                messageEl.textContent = message;
+                dialog.showModal();
+                return promise;
+            }
+        });
+    };
+    qq.UiEventHandler = function(s, protectedApi) {
+        "use strict";
+        var disposer = new qq.DisposeSupport(), spec = {
+            eventType: "click",
+            attachTo: null,
+            onHandled: function(target, event) {}
+        };
+        qq.extend(this, {
+            addHandler: function(element) {
+                addHandler(element);
+            },
+            dispose: function() {
+                disposer.dispose();
+            }
+        });
+        function addHandler(element) {
+            disposer.attach(element, spec.eventType, function(event) {
+                event = event || window.event;
+                var target = event.target || event.srcElement;
+                spec.onHandled(target, event);
+            });
+        }
+        qq.extend(protectedApi, {
+            getFileIdFromItem: function(item) {
+                return item.qqFileId;
+            },
+            getDisposeSupport: function() {
+                return disposer;
+            }
+        });
+        qq.extend(spec, s);
+        if (spec.attachTo) {
+            addHandler(spec.attachTo);
+        }
+    };
+    qq.FileButtonsClickHandler = function(s) {
+        "use strict";
+        var inheritedInternalApi = {}, spec = {
+            templating: null,
+            log: function(message, lvl) {},
+            onDeleteFile: function(fileId) {},
+            onCancel: function(fileId) {},
+            onRetry: function(fileId) {},
+            onPause: function(fileId) {},
+            onContinue: function(fileId) {},
+            onGetName: function(fileId) {}
+        }, buttonHandlers = {
+            cancel: function(id) {
+                spec.onCancel(id);
+            },
+            retry: function(id) {
+                spec.onRetry(id);
+            },
+            deleteButton: function(id) {
+                spec.onDeleteFile(id);
+            },
+            pause: function(id) {
+                spec.onPause(id);
+            },
+            continueButton: function(id) {
+                spec.onContinue(id);
+            }
+        };
+        function examineEvent(target, event) {
+            qq.each(buttonHandlers, function(buttonType, handler) {
+                var firstLetterCapButtonType = buttonType.charAt(0).toUpperCase() + buttonType.slice(1), fileId;
+                if (spec.templating["is" + firstLetterCapButtonType](target)) {
+                    fileId = spec.templating.getFileId(target);
+                    qq.preventDefault(event);
+                    spec.log(qq.format("Detected valid file button click event on file '{}', ID: {}.", spec.onGetName(fileId), fileId));
+                    handler(fileId);
+                    return false;
+                }
+            });
+        }
+        qq.extend(spec, s);
+        spec.eventType = "click";
+        spec.onHandled = examineEvent;
+        spec.attachTo = spec.templating.getFileList();
+        qq.extend(this, new qq.UiEventHandler(spec, inheritedInternalApi));
+    };
+    qq.FilenameClickHandler = function(s) {
+        "use strict";
+        var inheritedInternalApi = {}, spec = {
+            templating: null,
+            log: function(message, lvl) {},
+            classes: {
+                file: "qq-upload-file",
+                editNameIcon: "qq-edit-filename-icon"
+            },
+            onGetUploadStatus: function(fileId) {},
+            onGetName: function(fileId) {}
+        };
+        qq.extend(spec, s);
+        function examineEvent(target, event) {
+            if (spec.templating.isFileName(target) || spec.templating.isEditIcon(target)) {
+                var fileId = spec.templating.getFileId(target), status = spec.onGetUploadStatus(fileId);
+                if (status === qq.status.SUBMITTED) {
+                    spec.log(qq.format("Detected valid filename click event on file '{}', ID: {}.", spec.onGetName(fileId), fileId));
+                    qq.preventDefault(event);
+                    inheritedInternalApi.handleFilenameEdit(fileId, target, true);
+                }
+            }
+        }
+        spec.eventType = "click";
+        spec.onHandled = examineEvent;
+        qq.extend(this, new qq.FilenameEditHandler(spec, inheritedInternalApi));
+    };
+    qq.FilenameInputFocusInHandler = function(s, inheritedInternalApi) {
+        "use strict";
+        var spec = {
+            templating: null,
+            onGetUploadStatus: function(fileId) {},
+            log: function(message, lvl) {}
+        };
+        if (!inheritedInternalApi) {
+            inheritedInternalApi = {};
+        }
+        function handleInputFocus(target, event) {
+            if (spec.templating.isEditInput(target)) {
+                var fileId = spec.templating.getFileId(target), status = spec.onGetUploadStatus(fileId);
+                if (status === qq.status.SUBMITTED) {
+                    spec.log(qq.format("Detected valid filename input focus event on file '{}', ID: {}.", spec.onGetName(fileId), fileId));
+                    inheritedInternalApi.handleFilenameEdit(fileId, target);
+                }
+            }
+        }
+        spec.eventType = "focusin";
+        spec.onHandled = handleInputFocus;
+        qq.extend(spec, s);
+        qq.extend(this, new qq.FilenameEditHandler(spec, inheritedInternalApi));
+    };
+    qq.FilenameInputFocusHandler = function(spec) {
+        "use strict";
+        spec.eventType = "focus";
+        spec.attachTo = null;
+        qq.extend(this, new qq.FilenameInputFocusInHandler(spec, {}));
+    };
+    qq.FilenameEditHandler = function(s, inheritedInternalApi) {
+        "use strict";
+        var spec = {
+            templating: null,
+            log: function(message, lvl) {},
+            onGetUploadStatus: function(fileId) {},
+            onGetName: function(fileId) {},
+            onSetName: function(fileId, newName) {},
+            onEditingStatusChange: function(fileId, isEditing) {}
+        };
+        function getFilenameSansExtension(fileId) {
+            var filenameSansExt = spec.onGetName(fileId), extIdx = filenameSansExt.lastIndexOf(".");
+            if (extIdx > 0) {
+                filenameSansExt = filenameSansExt.substr(0, extIdx);
+            }
+            return filenameSansExt;
+        }
+        function getOriginalExtension(fileId) {
+            var origName = spec.onGetName(fileId);
+            return qq.getExtension(origName);
+        }
+        function handleNameUpdate(newFilenameInputEl, fileId) {
+            var newName = newFilenameInputEl.value, origExtension;
+            if (newName !== undefined && qq.trimStr(newName).length > 0) {
+                origExtension = getOriginalExtension(fileId);
+                if (origExtension !== undefined) {
+                    newName = newName + "." + origExtension;
+                }
+                spec.onSetName(fileId, newName);
+            }
+            spec.onEditingStatusChange(fileId, false);
+        }
+        function registerInputBlurHandler(inputEl, fileId) {
+            inheritedInternalApi.getDisposeSupport().attach(inputEl, "blur", function() {
+                handleNameUpdate(inputEl, fileId);
+            });
+        }
+        function registerInputEnterKeyHandler(inputEl, fileId) {
+            inheritedInternalApi.getDisposeSupport().attach(inputEl, "keyup", function(event) {
+                var code = event.keyCode || event.which;
+                if (code === 13) {
+                    handleNameUpdate(inputEl, fileId);
+                }
+            });
+        }
+        qq.extend(spec, s);
+        spec.attachTo = spec.templating.getFileList();
+        qq.extend(this, new qq.UiEventHandler(spec, inheritedInternalApi));
+        qq.extend(inheritedInternalApi, {
+            handleFilenameEdit: function(id, target, focusInput) {
+                var newFilenameInputEl = spec.templating.getEditInput(id);
+                spec.onEditingStatusChange(id, true);
+                newFilenameInputEl.value = getFilenameSansExtension(id);
+                if (focusInput) {
+                    newFilenameInputEl.focus();
+                }
+                registerInputBlurHandler(newFilenameInputEl, id);
+                registerInputEnterKeyHandler(newFilenameInputEl, id);
+            }
+        });
+    };
+})(window);
+//# sourceMappingURL=fine-uploader.js.map

+ 33 - 29
services/web/public/stylesheets/components/fineupload.less

@@ -4,11 +4,11 @@
  *
  * Licensed under MIT license, GNU GPL 2 or later, GNU LGPL 2 or later, see license.txt.
  */
-.qq-uploader {
+.qq-uploader-selector {
     position: relative;
     width: 100%;
 }
-.qq-uploader {
+.qq-uploader-selector {
 	text-align: center;
 	.drag-here {
 		border: 1px dashed #666;
@@ -18,7 +18,7 @@
 		margin-top: 6px;
 	}
 }
-/*.qq-upload-button {
+/*.qq-upload-button-selector {
     display: block;
     width: 105px;
     padding: 7px 0;
@@ -27,13 +27,13 @@
     border-bottom: 1px solid #DDD;
     color: #FFF;
 }
-.qq-upload-button-hover {
+.qq-upload-button-hover-selector {
     background: #CC0000;
 }
-.qq-upload-button-focus {
+.qq-upload-button-focus-selector {
     outline: 1px dotted #000000;
 }*/
-.qq-upload-drop-area, .qq-upload-extra-drop-area {
+.qq-upload-drop-area-selector, .qq-upload-extra-drop-area-selector {
     position: absolute;
     top: 0;
     left: 0;
@@ -44,7 +44,7 @@
     background: @orange;
     text-align: center;
 }
-.qq-upload-drop-area span {
+.qq-upload-drop-area-selector span {
     display: block;
     position: absolute;
     top: 50%;
@@ -53,7 +53,7 @@
     font-size: 16px;
     color: white;
 }
-.qq-upload-extra-drop-area {
+.qq-upload-extra-drop-area-selector {
     position: relative;
     margin-top: 50px;
     font-size: 16px;
@@ -61,15 +61,15 @@
     height: 20px;
     min-height: 40px;
 }
-.qq-upload-drop-area-active {
+.qq-upload-drop-area-active-selector {
     background: darken(@orange, 15%);
 }
-.qq-upload-list {
+.qq-upload-list-selector {
     margin: 0;
     padding: 0;
     list-style: none;
 }
-.qq-upload-list li {
+.qq-upload-list-selector li {
     margin: 0;
 	margin-top: 10px;
     padding: 9px;
@@ -77,74 +77,74 @@
     font-size: 16px;
     background-color: @gray-lightest;
 }
-.qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-retry, .qq-upload-failed-text, .qq-upload-finished, .qq-upload-delete {
+.qq-upload-file-selector, .qq-upload-spinner-selector, .qq-upload-size-selector, .qq-upload-cancel-selector, .qq-upload-retry-selector, .qq-upload-failed-text-selector, .qq-upload-finished-selector, .qq-upload-delete-selector {
     margin-right: 12px;
 }
-.qq-upload-file {
+.qq-upload-file-selector {
 }
-.qq-upload-spinner {
+.qq-upload-spinner-selector {
     display: inline-block;
     width: 15px;
     height: 15px;
     vertical-align: text-bottom;
 }
-.qq-drop-processing {
+.qq-drop-processing-selector {
     display: none;
 }
-.qq-drop-processing-spinner {
+.qq-drop-processing-spinner-selector {
     display: inline-block;
     background: url("processing.gif");
     width: 24px;
     height: 24px;
     vertical-align: text-bottom;
 }
-.qq-upload-finished {
+.qq-upload-finished-selector {
     display:none;
     width:15px;
     height:15px;
     vertical-align:text-bottom;
 }
-.qq-upload-retry, .qq-upload-delete {
+.qq-upload-retry-selector, .qq-upload-delete-selector {
     display: none;
     // color: #000000;
 }
-.qq-upload-cancel, .qq-upload-delete {
+.qq-upload-cancel-selector, .qq-upload-delete-selector {
 	// color: #000000;
 }
-.qq-upload-retryable .qq-upload-retry {
+.qq-upload-retryable-selector .qq-upload-retry-selector {
     display: inline;
 }
-.qq-upload-size, .qq-upload-cancel, .qq-upload-retry, .qq-upload-delete {
+.qq-upload-size-selector, .qq-upload-cancel-selector, .qq-upload-retry-selector, .qq-upload-delete-selector {
     font-size: 12px;
     font-weight: normal;
 }
-.qq-upload-failed-text {
+.qq-upload-failed-text-selector {
     display: none;
     font-style: italic;
     font-weight: bold;
 }
-.qq-upload-failed-icon {
+.qq-upload-failed-icon-selector {
     display:none;
     width:15px;
     height:15px;
     vertical-align:text-bottom;
 }
-.qq-upload-fail .qq-upload-failed-text {
+.qq-upload-fail-selector .qq-upload-failed-text-selector {
     display: inline;
 }
-.qq-upload-retrying .qq-upload-failed-text {
+.qq-upload-retrying-selector .qq-upload-failed-text-selector {
     display: inline;
     color: #D60000;
 }
-.qq-upload-list li.qq-upload-success {
+.qq-upload-list-selector li.qq-upload-success-selector {
     background-color: @green;
     color: #FFFFFF;
 }
-.qq-upload-list li.qq-upload-fail {
+.qq-upload-list-selector li.qq-upload-fail-selector {
     background-color: @red;
     color: #FFFFFF;
 }
-.qq-progress-bar {
+.qq-progress-bar-selector {
     width: 0%;
     height: @line-height-computed;
     margin-bottom: @line-height-computed / 2;
@@ -156,5 +156,9 @@
     .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
     .transition(width .6s ease);
     border-radius: @border-radius-base 0 0 @border-radius-base;
-    display: none;
+}
+a.qq-btn {
+	&:hover {
+		cursor: pointer !important;
+	}
 }

+ 0 - 1
services/web/test/acceptance/coffee/helpers/redis.coffee

@@ -1,5 +1,4 @@
 Settings = require('settings-sharelatex')
-redis = require('redis-sharelatex')
 logger = require("logger-sharelatex")
 Async = require('async')
 

+ 1 - 1
services/web/test/acceptance/coffee/helpers/request.coffee

@@ -1,4 +1,4 @@
-BASE_URL = "http://localhost:3000"
+BASE_URL = "http://#{process.env["HTTP_TEST_HOST"] or "localhost"}:3000"
 module.exports = require("request").defaults({
 	baseUrl: BASE_URL,
 	followRedirect: false

+ 0 - 119
services/web/test/unit/coffee/Labels/LabelsControllerTests.coffee

@@ -1,119 +0,0 @@
-chai = require('chai')
-chai.should()
-expect = chai.expect
-sinon = require("sinon")
-modulePath = "../../../../app/js/Features/Labels/LabelsController"
-SandboxedModule = require('sandboxed-module')
-
-
-describe 'LabelsController', ->
-	beforeEach ->
-		@projectId = 'somekindofid'
-		@EditorRealTimeController = {
-			emitToRoom: sinon.stub()
-		}
-		@LabelsHandler = {
-			getAllLabelsForProject: sinon.stub()
-			getLabelsForDoc: sinon.stub()
-		}
-		@LabelsController = SandboxedModule.require modulePath, requires:
-			'logger-sharelatex': {log: sinon.stub(), err: sinon.stub()}
-			'../Editor/EditorRealTimeController': @EditorRealTimeController
-			'./LabelsHandler': @LabelsHandler
-
-	describe 'getAllLabels', ->
-		beforeEach ->
-			@fakeLabels = {'somedoc': ['a_label']}
-			@LabelsHandler.getAllLabelsForProject = sinon.stub().callsArgWith(1, null, @fakeLabels)
-			@req = {params: {project_id: @projectId}}
-			@res = {json: sinon.stub()}
-			@next = sinon.stub()
-
-		it 'should call LabelsHandler.getAllLabelsForProject', () ->
-			@LabelsController.getAllLabels(@req, @res, @next)
-			@LabelsHandler.getAllLabelsForProject.callCount.should.equal 1
-			@LabelsHandler.getAllLabelsForProject.calledWith(@projectId).should.equal true
-
-		it 'should call not call next with an error', () ->
-			@LabelsController.getAllLabels(@req, @res, @next)
-			@next.callCount.should.equal 0
-
-		it 'should send a json response', () ->
-			@LabelsController.getAllLabels(@req, @res, @next)
-			@res.json.callCount.should.equal 1
-			expect(@res.json.lastCall.args[0]).to.have.all.keys ['projectId', 'projectLabels']
-
-		describe 'when LabelsHandler.getAllLabelsForProject produces an error', ->
-			beforeEach ->
-				@LabelsHandler.getAllLabelsForProject = sinon.stub().callsArgWith(1, new Error('woops'))
-				@req = {params: {project_id: @projectId}}
-				@res = {json: sinon.stub()}
-				@next = sinon.stub()
-
-			it 'should call LabelsHandler.getAllLabelsForProject', () ->
-				@LabelsController.getAllLabels(@req, @res, @next)
-				@LabelsHandler.getAllLabelsForProject.callCount.should.equal 1
-				@LabelsHandler.getAllLabelsForProject.calledWith(@projectId).should.equal true
-
-			it 'should call next with an error', ->
-				@LabelsController.getAllLabels(@req, @res, @next)
-				@next.callCount.should.equal 1
-				expect(@next.lastCall.args[0]).to.be.instanceof Error
-
-			it 'should not send a json response', ->
-				@LabelsController.getAllLabels(@req, @res, @next)
-				@res.json.callCount.should.equal 0
-
-	describe 'broadcastLabelsForDoc', ->
-		beforeEach ->
-			@LabelsHandler.getLabelsForDoc = sinon.stub().callsArgWith(2, null, @fakeLabels)
-			@EditorRealTimeController.emitToRoom = sinon.stub()
-			@docId = 'somedoc'
-			@req = {params: {project_id: @projectId, doc_id: @docId}}
-			@res = {sendStatus: sinon.stub()}
-			@next = sinon.stub()
-
-		it 'should call LabelsHandler.getLabelsForDoc', () ->
-			@LabelsController.broadcastLabelsForDoc(@req, @res, @next)
-			@LabelsHandler.getLabelsForDoc.callCount.should.equal 1
-			@LabelsHandler.getLabelsForDoc.calledWith(@projectId).should.equal true
-
-		it 'should call not call next with an error', () ->
-			@LabelsController.broadcastLabelsForDoc(@req, @res, @next)
-			@next.callCount.should.equal 0
-
-		it 'should send a success response', () ->
-			@LabelsController.broadcastLabelsForDoc(@req, @res, @next)
-			@res.sendStatus.callCount.should.equal 1
-			@res.sendStatus.calledWith(200).should.equal true
-
-		it 'should emit a message to room', () ->
-			@LabelsController.broadcastLabelsForDoc(@req, @res, @next)
-			@EditorRealTimeController.emitToRoom.callCount.should.equal 1
-			lastCall = @EditorRealTimeController.emitToRoom.lastCall
-			expect(lastCall.args[0]).to.equal @projectId
-			expect(lastCall.args[1]).to.equal 'broadcastDocLabels'
-			expect(lastCall.args[2]).to.have.all.keys ['docId', 'labels']
-
-		describe 'when LabelsHandler.getLabelsForDoc produces an error', ->
-			beforeEach ->
-				@LabelsHandler.getLabelsForDoc = sinon.stub().callsArgWith(2, new Error('woops'))
-				@EditorRealTimeController.emitToRoom = sinon.stub()
-				@docId = 'somedoc'
-				@req = {params: {project_id: @projectId, doc_id: @docId}}
-				@res = {json: sinon.stub()}
-				@next = sinon.stub()
-
-			it 'should call LabelsHandler.getLabelsForDoc', () ->
-				@LabelsController.broadcastLabelsForDoc(@req, @res, @next)
-				@LabelsHandler.getLabelsForDoc.callCount.should.equal 1
-				@LabelsHandler.getLabelsForDoc.calledWith(@projectId).should.equal true
-
-			it 'should call next with an error', ->
-				@LabelsController.broadcastLabelsForDoc(@req, @res, @next)
-				@next.callCount.should.equal 1
-				expect(@next.lastCall.args[0]).to.be.instanceof Error
-
-			it 'should not send a json response', ->
-				@LabelsController.broadcastLabelsForDoc(@req, @res, @next)
-				@res.json.callCount.should.equal 0

+ 0 - 134
services/web/test/unit/coffee/Labels/LabelsHandlerTests.coffee

@@ -1,134 +0,0 @@
-chai = require('chai')
-chai.should()
-expect = chai.expect
-sinon = require("sinon")
-modulePath = "../../../../app/js/Features/Labels/LabelsHandler"
-SandboxedModule = require('sandboxed-module')
-
-
-describe 'LabelsHandler', ->
-	beforeEach ->
-		@projectId = 'someprojectid'
-		@docId = 'somedocid'
-		@ProjectEntityHandler = {
-			getAllDocs: sinon.stub()
-			getDoc: sinon.stub()
-		}
-		@DocumentUpdaterHandler = {
-			flushDocToMongo: sinon.stub()
-		}
-		@LabelsHandler = SandboxedModule.require modulePath, requires:
-			'../Project/ProjectEntityHandler': @ProjectEntityHandler
-			'../DocumentUpdater/DocumentUpdaterHandler': @DocumentUpdaterHandler
-
-	describe 'extractLabelsFromDoc', ->
-		beforeEach ->
-			@lines = [
-				'one',
-				'two',
-				'three \\label{aaa}',
-				'four five',
-				'\\label{bbb}',
-				'six seven'
-			]
-
-		it 'should extract all the labels', ->
-			docLabels = @LabelsHandler.extractLabelsFromDoc @lines
-			expect(docLabels).to.deep.equal ['aaa', 'bbb']
-
-	describe 'extractLabelsFromProjectDocs', ->
-		beforeEach ->
-			@docs = {
-				'doc_one': {
-					_id: 'id_one',
-					lines: ['one', '\\label{aaa} two', 'three']
-				},
-				'doc_two': {
-					_id: 'id_two',
-					lines: ['four']
-				},
-				'doc_three': {
-					_id: 'id_three',
-					lines: ['\\label{bbb}', 'five six', 'seven eight \\label{ccc} nine']
-				}
-			}
-
-		it 'should extract all the labels', ->
-			projectLabels = @LabelsHandler.extractLabelsFromProjectDocs @docs
-			expect(projectLabels).to.deep.equal {
-				'id_one': ['aaa'],
-				'id_two': [],
-				'id_three': ['bbb', 'ccc']
-			}
-
-	describe 'getLabelsForDoc', ->
-		beforeEach ->
-			@fakeLines = ['one', '\\label{aaa}', 'two']
-			@fakeLabels = ['aaa']
-			@DocumentUpdaterHandler.flushDocToMongo = sinon.stub().callsArgWith(2, null)
-			@ProjectEntityHandler.getDoc = sinon.stub().callsArgWith(2, null, @fakeLines)
-			@LabelsHandler.extractLabelsFromDoc = sinon.stub().returns(@fakeLabels)
-			@call = (callback) =>
-				@LabelsHandler.getLabelsForDoc @projectId, @docId, callback
-
-		it 'should not produce an error', (done) ->
-			@call (err, docLabels) =>
-				expect(err).to.equal null
-				done()
-
-		it 'should produce docLabels', (done) ->
-			@call (err, docLabels) =>
-				expect(docLabels).to.equal @fakeLabels
-				done()
-
-		it 'should call flushDocToMongo', (done) ->
-			@call (err, docLabels) =>
-				@DocumentUpdaterHandler.flushDocToMongo.callCount.should.equal 1
-				@DocumentUpdaterHandler.flushDocToMongo.calledWith(@projectId, @docId).should.equal true
-				done()
-
-		it 'should call getDoc', (done) ->
-			@call (err, docLabels) =>
-				@ProjectEntityHandler.getDoc.callCount.should.equal 1
-				@ProjectEntityHandler.getDoc.calledWith(@projectId, @docId).should.equal true
-				done()
-
-		it 'should call extractLabelsFromDoc', (done) ->
-			@call (err, docLabels) =>
-				@LabelsHandler.extractLabelsFromDoc.callCount.should.equal 1
-				@LabelsHandler.extractLabelsFromDoc.calledWith(@fakeLines).should.equal true
-				done()
-
-	describe 'getAllLabelsForProject', ->
-		beforeEach ->
-			@fakeDocs = {
-				'doc_one': {lines: ['\\label{aaa}']}
-			}
-			@fakeLabels = ['aaa']
-			@DocumentUpdaterHandler.flushProjectToMongo = sinon.stub().callsArgWith(1, null)
-			@ProjectEntityHandler.getAllDocs = sinon.stub().callsArgWith(1, null, @fakeDocs)
-			@LabelsHandler.extractLabelsFromProjectDocs = sinon.stub().returns(@fakeLabels)
-			@call = (callback) =>
-				@LabelsHandler.getAllLabelsForProject @projectId, callback
-
-		it 'should not produce an error', (done) ->
-			@call (err, projectLabels) =>
-				expect(err).to.equal null
-				done()
-
-		it 'should produce projectLabels', (done) ->
-			@call (err, projectLabels) =>
-				expect(projectLabels).to.equal @fakeLabels
-				done()
-
-		it 'should call getAllDocs', (done) ->
-			@call (err, projectLabels) =>
-				@ProjectEntityHandler.getAllDocs.callCount.should.equal 1
-				@ProjectEntityHandler.getAllDocs.calledWith(@projectId).should.equal true
-				done()
-
-		it 'should call extractLabelsFromDoc', (done) ->
-			@call (err, docLabels) =>
-				@LabelsHandler.extractLabelsFromProjectDocs.callCount.should.equal 1
-				@LabelsHandler.extractLabelsFromProjectDocs.calledWith(@fakeDocs).should.equal true
-				done()

+ 119 - 0
services/web/test/unit/coffee/Metadata/MetaControllerTests.coffee

@@ -0,0 +1,119 @@
+chai = require('chai')
+chai.should()
+expect = chai.expect
+sinon = require("sinon")
+modulePath = "../../../../app/js/Features/Metadata/MetaController"
+SandboxedModule = require('sandboxed-module')
+
+
+describe 'MetaController', ->
+	beforeEach ->
+		@projectId = 'somekindofid'
+		@EditorRealTimeController = {
+			emitToRoom: sinon.stub()
+		}
+		@MetaHandler = {
+			getAllMetaForProject: sinon.stub()
+			getMetaForDoc: sinon.stub()
+		}
+		@MetadataController = SandboxedModule.require modulePath, requires:
+			'logger-sharelatex': {log: sinon.stub(), err: sinon.stub()}
+			'../Editor/EditorRealTimeController': @EditorRealTimeController
+			'./MetaHandler': @MetaHandler
+
+	describe 'getMetadata', ->
+		beforeEach ->
+			@fakeLabels = {'somedoc': ['a_label']}
+			@MetaHandler.getAllMetaForProject = sinon.stub().callsArgWith(1, null, @fakeLabels)
+			@req = {params: {project_id: @projectId}}
+			@res = {json: sinon.stub()}
+			@next = sinon.stub()
+
+		it 'should call MetaHandler.getAllMetaForProject', () ->
+			@MetadataController.getMetadata(@req, @res, @next)
+			@MetaHandler.getAllMetaForProject.callCount.should.equal 1
+			@MetaHandler.getAllMetaForProject.calledWith(@projectId).should.equal true
+
+		it 'should call not call next with an error', () ->
+			@MetadataController.getMetadata(@req, @res, @next)
+			@next.callCount.should.equal 0
+
+		it 'should send a json response', () ->
+			@MetadataController.getMetadata(@req, @res, @next)
+			@res.json.callCount.should.equal 1
+			expect(@res.json.lastCall.args[0]).to.have.all.keys ['projectId', 'projectMeta']
+
+		describe 'when MetaHandler.getAllMetaForProject produces an error', ->
+			beforeEach ->
+				@MetaHandler.getAllMetaForProject = sinon.stub().callsArgWith(1, new Error('woops'))
+				@req = {params: {project_id: @projectId}}
+				@res = {json: sinon.stub()}
+				@next = sinon.stub()
+
+			it 'should call MetaHandler.getAllMetaForProject', () ->
+				@MetadataController.getMetadata(@req, @res, @next)
+				@MetaHandler.getAllMetaForProject.callCount.should.equal 1
+				@MetaHandler.getAllMetaForProject.calledWith(@projectId).should.equal true
+
+			it 'should call next with an error', ->
+				@MetadataController.getMetadata(@req, @res, @next)
+				@next.callCount.should.equal 1
+				expect(@next.lastCall.args[0]).to.be.instanceof Error
+
+			it 'should not send a json response', ->
+				@MetadataController.getMetadata(@req, @res, @next)
+				@res.json.callCount.should.equal 0
+
+	describe 'broadcastMetadataForDoc', ->
+		beforeEach ->
+			@MetaHandler.getMetaForDoc = sinon.stub().callsArgWith(2, null, @fakeLabels)
+			@EditorRealTimeController.emitToRoom = sinon.stub()
+			@docId = 'somedoc'
+			@req = {params: {project_id: @projectId, doc_id: @docId}}
+			@res = {sendStatus: sinon.stub()}
+			@next = sinon.stub()
+
+		it 'should call MetaHandler.getMetaForDoc', () ->
+			@MetadataController.broadcastMetadataForDoc(@req, @res, @next)
+			@MetaHandler.getMetaForDoc.callCount.should.equal 1
+			@MetaHandler.getMetaForDoc.calledWith(@projectId).should.equal true
+
+		it 'should call not call next with an error', () ->
+			@MetadataController.broadcastMetadataForDoc(@req, @res, @next)
+			@next.callCount.should.equal 0
+
+		it 'should send a success response', () ->
+			@MetadataController.broadcastMetadataForDoc(@req, @res, @next)
+			@res.sendStatus.callCount.should.equal 1
+			@res.sendStatus.calledWith(200).should.equal true
+
+		it 'should emit a message to room', () ->
+			@MetadataController.broadcastMetadataForDoc(@req, @res, @next)
+			@EditorRealTimeController.emitToRoom.callCount.should.equal 1
+			lastCall = @EditorRealTimeController.emitToRoom.lastCall
+			expect(lastCall.args[0]).to.equal @projectId
+			expect(lastCall.args[1]).to.equal 'broadcastDocMeta'
+			expect(lastCall.args[2]).to.have.all.keys ['docId', 'meta']
+
+		describe 'when MetaHandler.getMetaForDoc produces an error', ->
+			beforeEach ->
+				@MetaHandler.getMetaForDoc = sinon.stub().callsArgWith(2, new Error('woops'))
+				@EditorRealTimeController.emitToRoom = sinon.stub()
+				@docId = 'somedoc'
+				@req = {params: {project_id: @projectId, doc_id: @docId}}
+				@res = {json: sinon.stub()}
+				@next = sinon.stub()
+
+			it 'should call MetaHandler.getMetaForDoc', () ->
+				@MetadataController.broadcastMetadataForDoc(@req, @res, @next)
+				@MetaHandler.getMetaForDoc.callCount.should.equal 1
+				@MetaHandler.getMetaForDoc.calledWith(@projectId).should.equal true
+
+			it 'should call next with an error', ->
+				@MetadataController.broadcastMetadataForDoc(@req, @res, @next)
+				@next.callCount.should.equal 1
+				expect(@next.lastCall.args[0]).to.be.instanceof Error
+
+			it 'should not send a json response', ->
+				@MetadataController.broadcastMetadataForDoc(@req, @res, @next)
+				@res.json.callCount.should.equal 0

+ 243 - 0
services/web/test/unit/coffee/Metadata/MetaHandlerTests.coffee

@@ -0,0 +1,243 @@
+chai = require('chai')
+chai.should()
+expect = chai.expect
+sinon = require("sinon")
+modulePath = "../../../../app/js/Features/Metadata/MetaHandler"
+SandboxedModule = require('sandboxed-module')
+
+
+describe 'MetaHandler', ->
+	beforeEach ->
+		@projectId = 'someprojectid'
+		@docId = 'somedocid'
+		@ProjectEntityHandler = {
+			getAllDocs: sinon.stub()
+			getDoc: sinon.stub()
+		}
+		@DocumentUpdaterHandler = {
+			flushDocToMongo: sinon.stub()
+		}
+		@packageMapping =
+			foo: [
+				{
+					caption: '\\bar'
+					snippet: '\\bar'
+					meta: 'foo-cmd'
+					score: 12
+				}, {
+					caption: '\\bat[]{}'
+					snippet: '\\bar[$1]{$2}'
+					meta: 'foo-cmd'
+					score: 10
+				}
+			],
+			baz: [
+				{
+					caption: '\\longercommandtest{}'
+					snippet: '\\longercommandtest{$1}'
+					meta: 'baz-cmd'
+					score: 50
+				}
+			]
+
+		@MetaHandler = SandboxedModule.require modulePath, requires:
+			'../Project/ProjectEntityHandler': @ProjectEntityHandler
+			'../DocumentUpdater/DocumentUpdaterHandler': @DocumentUpdaterHandler
+			'./packageMapping': @packageMapping
+
+	describe 'extractMetaFromDoc', ->
+		beforeEach ->
+			@lines = [
+				'\\usepackage{foo}'
+				'\\usepackage{amsmath, booktabs}'
+				'one'
+				'two'
+				'three \\label{aaa}'
+				'four five'
+				'\\label{bbb}'
+				'six seven'
+			]
+
+		it 'should extract all the labels and packages', ->
+			docMeta = @MetaHandler.extractMetaFromDoc @lines
+			expect(docMeta).to.deep.equal {
+				labels: ['aaa', 'bbb']
+				packages:
+					foo: [
+						{
+							caption: '\\bar'
+							snippet: '\\bar'
+							meta: 'foo-cmd'
+							score: 12
+						}, {
+							caption: '\\bat[]{}'
+							snippet: '\\bar[$1]{$2}'
+							meta: 'foo-cmd'
+							score: 10
+						}
+					]
+			}
+
+	describe 'extractMetaFromProjectDocs', ->
+		beforeEach ->
+			@docs =
+				'doc_one':
+					_id: 'id_one'
+					lines: ['one', '\\label{aaa} two', 'three']
+				'doc_two':
+					_id: 'id_two'
+					lines: ['four']
+				'doc_three':
+					_id: 'id_three'
+					lines: [
+						'\\label{bbb}'
+						'five six'
+						'seven eight \\label{ccc} nine'
+					]
+				'doc_four':
+					_id: 'id_four'
+					lines: [
+						'\\usepackage[width=\\textwidth]{baz}'
+						'\\usepackage{amsmath}'
+					]
+				'doc_five':
+					_id: 'id_five'
+					lines: [
+						'\\usepackage{foo,baz}'
+						'\\usepackage[options=foo]{hello}'
+						'some text'
+						'\\section{this}\\label{sec:intro}'
+						'In Section \\ref{sec:intro} we saw'
+						'nothing'
+					]
+
+		it 'should extract all metadata', ->
+			projectMeta = @MetaHandler.extractMetaFromProjectDocs @docs
+			expect(projectMeta).to.deep.equal {
+				'id_one': {labels: ['aaa'], packages: {}}
+				'id_two': {labels: [], packages: {}}
+				'id_three': {labels: ['bbb', 'ccc'], packages: {}}
+				'id_four':
+					labels: []
+					packages:
+						baz: [{
+							caption: '\\longercommandtest{}'
+							snippet: '\\longercommandtest{$1}'
+							meta: 'baz-cmd'
+							score: 50}]
+				'id_five':
+					labels: ['sec:intro']
+					packages:
+						foo: [
+							{
+								caption: '\\bar'
+								snippet: '\\bar'
+								meta: 'foo-cmd'
+								score: 12
+							}, {
+								caption: '\\bat[]{}'
+								snippet: '\\bar[$1]{$2}'
+								meta: 'foo-cmd'
+								score: 10
+							}
+						]
+						baz: [
+							{
+								caption: '\\longercommandtest{}'
+								snippet: '\\longercommandtest{$1}'
+								meta: 'baz-cmd'
+								score: 50
+							}
+						]
+			}
+
+	describe 'getMetaForDoc', ->
+		beforeEach ->
+			@fakeLines = ['\\usepackage{abc}', 'one', '\\label{aaa}', 'two']
+			@fakeMeta = {labels: ['aaa'], packages: ['abc']}
+			@DocumentUpdaterHandler.flushDocToMongo = sinon.stub().callsArgWith 2, null
+			@ProjectEntityHandler.getDoc = sinon.stub().callsArgWith 2, null, @fakeLines
+			@MetaHandler.extractMetaFromDoc = sinon.stub().returns @fakeMeta
+			@call = (callback) =>
+				@MetaHandler.getMetaForDoc @projectId, @docId, callback
+
+		it 'should not produce an error', (done) ->
+			@call (err, docMeta) =>
+				expect(err).to.equal null
+				done()
+
+		it 'should produce docMeta', (done) ->
+			@call (err, docMeta) =>
+				expect(docMeta).to.equal @fakeMeta
+				done()
+
+		it 'should call flushDocToMongo', (done) ->
+			@call (err, docMeta) =>
+				@DocumentUpdaterHandler.flushDocToMongo.callCount.should.equal 1
+				@DocumentUpdaterHandler.flushDocToMongo.calledWith(@projectId, @docId).should.equal true
+				done()
+
+		it 'should call getDoc', (done) ->
+			@call (err, docMeta) =>
+				@ProjectEntityHandler.getDoc.callCount.should.equal 1
+				@ProjectEntityHandler.getDoc.calledWith(@projectId, @docId).should.equal true
+				done()
+
+		it 'should call extractMetaFromDoc', (done) ->
+			@call (err, docMeta) =>
+				@MetaHandler.extractMetaFromDoc.callCount.should.equal 1
+				@MetaHandler.extractMetaFromDoc.calledWith(@fakeLines).should.equal true
+				done()
+
+	describe 'getAllMetaForProject', ->
+		beforeEach ->
+			@fakeDocs =
+				'doc_one':
+					lines: [
+						'\\usepackage[some-options,more=foo]{foo}'
+						'\\label{aaa}'
+					]
+
+			@fakeMeta =
+				labels: ['aaa']
+				packages:
+					foo: [
+						{
+							caption: '\\bar'
+							snippet: '\\bar'
+							meta: 'foo-cmd'
+							score: 12
+						}, {
+							caption: '\\bat[]{}'
+							snippet: '\\bar[$1]{$2}'
+							meta: 'foo-cmd'
+							score: 10
+						}
+					]
+			@DocumentUpdaterHandler.flushProjectToMongo = sinon.stub().callsArgWith 1, null
+			@ProjectEntityHandler.getAllDocs = sinon.stub().callsArgWith 1, null, @fakeDocs
+			@MetaHandler.extractMetaFromProjectDocs = sinon.stub().returns @fakeMeta
+			@call = (callback) =>
+				@MetaHandler.getAllMetaForProject @projectId, callback
+
+		it 'should not produce an error', (done) ->
+			@call (err, projectMeta) =>
+				expect(err).to.equal null
+				done()
+
+		it 'should produce projectMeta', (done) ->
+			@call (err, projectMeta) =>
+				expect(projectMeta).to.equal @fakeMeta
+				done()
+
+		it 'should call getAllDocs', (done) ->
+			@call (err, projectMeta) =>
+				@ProjectEntityHandler.getAllDocs.callCount.should.equal 1
+				@ProjectEntityHandler.getAllDocs.calledWith(@projectId).should.equal true
+				done()
+
+		it 'should call extractMetaFromDoc', (done) ->
+			@call (err, docMeta) =>
+				@MetaHandler.extractMetaFromProjectDocs.callCount.should.equal 1
+				@MetaHandler.extractMetaFromProjectDocs.calledWith(@fakeDocs).should.equal true
+				done()

+ 10 - 32
services/web/test/unit/coffee/Subscription/SubscriptionControllerTests.coffee

@@ -44,6 +44,7 @@ describe "SubscriptionController", ->
 
 		@RecurlyWrapper =
 			sign: sinon.stub().callsArgWith(1, null, "somthing")
+			getSubscription: sinon.stub().callsArgWith(2, null, {})
 
 		@SubscriptionViewModelBuilder =
 			buildUsersSubscriptionViewModel:sinon.stub().callsArgWith(1, null, @activeRecurlySubscription)
@@ -55,7 +56,7 @@ describe "SubscriptionController", ->
 					collaborator:"COLLABORATORCODEHERE"
 			apis:
 				recurly:
-					subdomain:"sl.recurly.com"
+					subdomain:"sl"
 			siteUrl: "http://de.sharelatex.dev:3000"
 			gaExperiments:{}
 		@GeoIpLookup =
@@ -118,34 +119,6 @@ describe "SubscriptionController", ->
 				@UserGetter.getUser.callCount.should.equal 0
 				done()
 
-
-	describe "editBillingDetailsPage", ->
-		describe "with a user with a subscription", ->
-			beforeEach (done) ->
-				@LimitationsManager.userHasSubscription.callsArgWith(1, null, true)
-				@user._id = @activeRecurlySubscription.account.account_code
-				@res.callback = done
-				@SubscriptionController.editBillingDetailsPage(@req, @res)
-
-			it "should render the edit billing details page", ->
-				@res.rendered.should.equal true
-				@res.renderedTemplate.should.equal "subscriptions/edit-billing-details"
-
-			it "should set the correct variables for the template", ->
-				should.exist @res.renderedVariables.signature
-				@res.renderedVariables.successURL.should.equal "#{@settings.siteUrl}/user/subscription/billing-details/update"
-				@res.renderedVariables.user.id.should.equal @user._id
-
-		describe "with a user without subscription", ->
-			beforeEach (done) ->
-				@res.callback = done
-				@LimitationsManager.userHasSubscription.callsArgWith(1, null, false)
-				@SubscriptionController.reactivateSubscription @req, @res
-
-			it "should redirect to the subscription dashboard", ->
-				@res.redirected.should.equal true
-				@res.redirectedTo.should.equal "/user/subscription"
-
 	describe "paymentPage", ->
 		beforeEach ->
 			@req.headers = {}
@@ -255,7 +228,12 @@ describe "SubscriptionController", ->
 			describe "with an existing subscription", ->
 				beforeEach (done)->
 					@res.callback = done
-					@LimitationsManager.userHasSubscriptionOrIsGroupMember.callsArgWith(1, null, true)
+					@settings.apis.recurly.subdomain = 'test'
+					@userSub = {account: {hosted_login_token: 'abcd'}}
+					@RecurlyWrapper.getSubscription = sinon.stub()
+						.callsArgWith(2, null, @userSub)
+					@LimitationsManager.userHasSubscriptionOrIsGroupMember
+						.callsArgWith(1, null, true, {})
 					@SubscriptionController.userSubscriptionPage @req, @res
 
 
@@ -266,7 +244,7 @@ describe "SubscriptionController", ->
 			beforeEach (done) ->
 				@res.callback = done
 				@SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel.callsArgWith(1, null, @activeRecurlySubscription)
-				@LimitationsManager.userHasSubscriptionOrIsGroupMember.callsArgWith(1, null, true)
+				@LimitationsManager.userHasSubscriptionOrIsGroupMember.callsArgWith(1, null, true, {})
 				@SubscriptionController.userSubscriptionPage @req, @res
 
 			it "should render the dashboard", (done)->
@@ -281,7 +259,7 @@ describe "SubscriptionController", ->
 			beforeEach (done) ->
 				@res.callback = done
 				@SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel.callsArgWith(1, null, @activeRecurlySubscription)
-				@LimitationsManager.userHasSubscriptionOrIsGroupMember.callsArgWith(1, null, true)
+				@LimitationsManager.userHasSubscriptionOrIsGroupMember.callsArgWith(1, null, true, {})
 				@SubscriptionController.userSubscriptionPage @req, @res
 
 			it "should render the dashboard", ->

Некоторые файлы не были показаны из-за большого количества измененных файлов