Merge pull request #35 from vaadin/upload

Adding vaadin-upload componet

2 files changed, 5 insertions, 3 deletions

diff --git a/bower.json b/bower.json
index a183556..059ffe0 100644
--- a/bower.json
+++ b/bower.json
@@ -27,12 +27,14 @@
     "vaadin-grid": "vaadin/vaadin-grid#~1.0.0",
     "vaadin-combo-box": "vaadin/vaadin-combo-box#1.0.0-alpha5",
     "vaadin-icons": "vaadin/vaadin-icons#1.0.0-alpha2",
-    "vaadin-date-picker": "vaadin/vaadin-date-picker#1.0.0-alpha1"
+    "vaadin-date-picker": "vaadin/vaadin-date-picker#1.0.0-alpha1",
+    "vaadin-upload": "vaadin/vaadin-upload#1.0.0-alpha1"
   },
   "devDependencies": {
     "iron-component-page": "polymerelements/iron-component-page#~1.1.0",
     "elements-demo-resources": "vaadin/elements-demo-resources#master",
-    "components-demo-resources": "vaadin/components-demo-resources#master"
+    "components-demo-resources": "vaadin/components-demo-resources#master",
+    "mock-http-request": "philikon/MockHttpRequest#master"
   },
   "resolutions": {
     "polymer": "v1.1.1"
diff --git a/tasks/config.js b/tasks/config.js
index 89188df..9cfc606 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -4,7 +4,7 @@ var fs = require('fs');
 var userhome = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
 
 module.exports = {
-  coreElements: ['vaadin-grid', 'vaadin-combo-box'],
+  coreElements: ['vaadin-grid', 'vaadin-combo-box', 'vaadin-date-picker', 'vaadin-upload'],
   version: args.version || 'master',
   permalink: args.version ? 'latest' : '',
   toolsHost: args.toolsHostname || 'tools.vaadin.com',

path: root/core/js/tests/html-domparser.js

/**
 * DOMParser HTML extension
 * 2012-09-04
 * 
 * By Eli Grey, http://eligrey.com
 * Public domain.
 * NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
 *
 * SPDX-FileCopyrightText: 2012 Eli Grey, http://eligrey.com
 * SPDX-License-Identifier: CC0-1.0
 */

/*! @source https://gist.github.com/1129031 */
/*global document, DOMParser*/

(function(DOMParser) {
	"use strict";

	var
	  DOMParser_proto = DOMParser.prototype
	, real_parseFromString = DOMParser_proto.parseFromString
	;

	// Firefox/Opera/IE throw errors on unsupported types
	try {
		// WebKit returns null on unsupported types
		if ((new DOMParser).parseFromString("", "text/html")) {
			// text/html parsing is natively supported
			return;
		}
	} catch (ex) {}

	DOMParser_proto.parseFromString = function(markup, type) {
		if (/^\s*text\/html\s*(?:;|$)/i.test(type)) {
			var
			  doc = document.implementation.createHTMLDocument("")
			;
	      		if (markup.toLowerCase().indexOf('<!doctype') > -1) {
        			doc.documentElement.innerHTML = markup;
      			}
      			else {
        			doc.body.innerHTML = markup;
      			}
			return doc;
		} else {
			return real_parseFromString.apply(this, arguments);
		}
	};
}(DOMParser));