diff --git a/gulp/copy.js b/gulp/copy.js
index 2833a37f3..77787e067 100644
--- a/gulp/copy.js
+++ b/gulp/copy.js
@@ -7,7 +7,6 @@ var paths = require('./paths.js');
gulp.task('copyJs', function () {
return gulp.src(
[
- paths.src.root + "piwikCheck.js",
paths.src.root + "polyfills.js",
paths.src.root + "JsLibraries\\handlebars.runtime.js",
])
diff --git a/src/UI/JsLibraries/xrayquire.js b/src/UI/JsLibraries/xrayquire.js
deleted file mode 100644
index 934f7f613..000000000
--- a/src/UI/JsLibraries/xrayquire.js
+++ /dev/null
@@ -1,416 +0,0 @@
-/**
- * @license xrayquire 0.0.0 Copyright (c) 2012, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/requirejs/xrayquire for details
- */
-/*jslint nomen: true */
-/*global requirejs, console, window */
-
-/**
- * Put a script tag in the HTML that references this script right after the
- * script tag for require.js.
- */
-
-var xrayquire;
-(function () {
- 'use strict';
-
- var contexts = {},
- config = typeof xrayquire === 'undefined' ? {} : xrayquire,
- s = requirejs.s,
- oldNewContext = s.newContext,
- tokenRegExp = /\{(\w+)\}/g,
- standardDeps = {
- require: true,
- exports: true,
- module: true
- },
- prop;
-
- function each(ary, func) {
- if (ary) {
- var i;
- for (i = 0; i < ary.length; i += 1) {
- if (ary[i] && func(ary[i], i, ary)) {
- break;
- }
- }
- }
- }
-
- /**
- * Cycles over properties in an object and calls a function for each
- * property value. If the function returns a truthy value, then the
- * iteration is stopped.
- */
- function eachProp(obj, func) {
- var prop;
- for (prop in obj) {
- if (obj.hasOwnProperty(prop)) {
- if (func(obj[prop], prop)) {
- break;
- }
- }
- }
- }
-
- function hasProp(obj, prop) {
- return obj.hasOwnProperty(prop);
- }
-
- /**
- * Simple function to mix in properties from source into target,
- * but only if target does not already have a property of the same name.
- * This is not robust in IE for transferring methods that match
- * Object.prototype names, but the uses of mixin here seem unlikely to
- * trigger a problem related to that.
- */
- function mixin(target, source, force, deepStringMixin) {
- if (source) {
- eachProp(source, function (value, prop) {
- if (force || !hasProp(target, prop)) {
- if (deepStringMixin && typeof value !== 'string') {
- if (!target[prop]) {
- target[prop] = {};
- }
- mixin(target[prop], value, force, deepStringMixin);
- } else {
- target[prop] = value;
- }
- }
- });
- }
- return target;
- }
-
- function isRequire(id) {
- return id.indexOf('_@r') !== -1;
- }
-
- function formatId(id) {
- //If the ID is for a require call, make it prettier.
- return isRequire(id) ? 'require()' : id;
- }
-
- function formatUrl(url) {
- return !url || isRequire(url) ? '' : url;
- }
-
- function getX(context) {
- if (!context.xray) {
- context.xray = {
- traced: {},
- traceOrder: [],
- mixedCases: {}
- };
- }
- return context.xray;
- }
-
- function modContext(context) {
- var oldLoad = context.load,
- modProto = context.Module.prototype,
- oldModuleEnable = modProto.enable,
- xray = getX(context),
- traced = xray.traced,
- mixedCases = xray.mixedCases;
-
- function trackModule(mod) {
- var id = mod.map.id,
- traceData;
-
- //If an intermediate module from a plugin, do not
- //track it
- if (mod.map.prefix && id.indexOf('_unnormalized') !== -1) {
- return;
- }
-
- //Cycle through the dependencies now, wire this up here
- //instead of context.load so that we get a recording of
- //modules as they are encountered, and not as they
- //are fetched/loaded, since things could fall over between
- //now and then.
- if (!traced[id] || !traced[id].deps || !traced[id].deps.length) {
- each(mod.depMaps, function (dep) {
- var depId = dep.id,
- lowerId = depId.toLowerCase();
-
- if (mixedCases[lowerId] && depId !== mixedCases[lowerId].id) {
- console.error('Mixed case modules may conflict: ' +
- formatId(mixedCases[lowerId].refId) +
- ' asked for: "' +
- mixedCases[lowerId].id +
- '" and ' +
- formatId(id) +
- ' asked for: "' +
- depId +
- '"');
- } else {
- mixedCases[lowerId] = {
- refId: id,
- id: depId
- };
- }
- });
-
- traceData = {
- map: mod.map,
- deps: mod.depMaps
- };
-
- //Only add this to the order if not previously added.
- if (!traced[id]) {
- xray.traceOrder.push(id);
- }
-
- //Set the data again in case this enable has the
- //real dependencies. Some first calls of enable do
- //not have the dependencies known yet.
- traced[id] = traceData;
- }
- }
-
- modProto.enable = function () {
- var result = oldModuleEnable.apply(this, arguments);
- trackModule(this);
- return result;
- };
-
- //Collect any modules that are already in process
- eachProp(context.registry, function (mod) {
- if (mod.enabled) {
- trackModule(mod);
- }
- });
-
- return context;
- }
-
- //Mod any existing contexts.
- eachProp(requirejs.s.contexts, function (context) {
- modContext(context);
- });
-
- //Apply mods to any new context.
- s.newContext = function (name) {
- return modContext(oldNewContext);
- };
-
- requirejs.onResourceLoad = function (context, map, deps) {
- var id = map.id;
-
- if (typeof context.defined[id] === 'undefined') {
- //May be a problem with a circular dependency.
- //console.error(id + ' has undefined module value, may be part ' +
- // 'of a bad circular reference');
- }
- };
-
-
- function sortTraceOrder(traceOrder) {
- //Sort the traceOrder, but do it by lowercase comparisons,
- //to keep 'something' and 'Something' next to each other.
- traceOrder.sort(function (a, b) {
- return a.toLowerCase() > b.toLowerCase() ? 1 : -1;
- });
- }
-
- function htmlEscape(id) {
- return (id || '')
- .replace('<', '<')
- .replace('>', '>')
- .replace('&', '&')
- .replace('"', '"');
- }
-
- function template(contents, data) {
- return contents.replace(tokenRegExp, function (match, token) {
- var result = data[token];
-
- //Just use empty string for null or undefined
- if (result === null || result === undefined) {
- result = '';
- }
-
- return result;
- });
- }
-
-
- function findCycle(mod, traced, masterVisited, visited) {
- var id = mod.map.id,
- depArray = mod.deps,
- foundModule;
-
- //Do not bother with require calls or standard deps,
- //or things that are already listed in a cycle
- if (isRequire(id) || masterVisited[id] || standardDeps[id]) {
- return;
- }
-
- //Found the cycle.
- if (visited[id]) {
- return {
- mod: mod,
- visited: visited
- };
- }
-
- visited[id] = true;
-
- //Trace through the dependencies.
- each(depArray, function (depMap) {
- var depId = depMap.id,
- depMod = traced[depId];
-
- if (!depMod) {
- return;
- }
-
- //mixin visited to a new object for each dependency, so that
- //sibling dependencies in this object to not generate a
- //false positive match on a cycle. Ideally an Object.create
- //type of prototype delegation would be used here, but
- //optimizing for file size vs. execution speed since hopefully
- //the trees are small for circular dependency scans relative
- //to the full app perf.
- return (foundModule = findCycle(depMod, traced, masterVisited, mixin({}, visited)));
- });
-
- return foundModule;
- }
-
- function showHtml(html) {
- //Convert to URL encoded data
- html = encodeURIComponent(html);
-
- //Display the HTML
- window.open('data:text/html;charset=utf-8,' + html, '_blank');
- }
-
- /**
- * Public API
- */
- xrayquire = {
- treeHtml: '\n\n\nModule Dependencies\n\n\n\n{content}\n\n\n',
- treeDepItemHtml: '{id}',
- treeDepItemNoLinkHtml: '{id}',
- treeItemHtml: '\n',
-
- makeHtmlId: function (id) {
- return encodeURIComponent(id);
- },
-
- makeTemplateData: function (mod) {
- return {
- htmlId: xrayquire.makeHtmlId(mod.id),
- id: htmlEscape(formatId(mod.id)),
- url: htmlEscape(formatUrl(mod.url))
- };
- },
-
- showTree: function (contextName) {
- var context = requirejs.s.contexts[contextName || '_'],
- xray = getX(context),
- traced = xray.traced,
- html = '';
-
- sortTraceOrder(xray.traceOrder);
-
- //Generate the HTML
- each(xray.traceOrder, function (id) {
- var mod = traced[id],
- templateData = xrayquire.makeTemplateData(mod.map);
-
- //Do not bother if this is a require() call with no
- //dependencies
- if (isRequire(mod.map.id) && (!mod.deps || !mod.deps.length)) {
- return;
- }
-
- templateData.depItems = '';
-
- each(mod.deps, function (dep) {
- var depHtmlTemplate = standardDeps[dep.id] ?
- xrayquire.treeDepItemNoLinkHtml :
- xrayquire.treeDepItemHtml;
-
- templateData.depItems += template(depHtmlTemplate,
- xrayquire.makeTemplateData(dep));
- });
-
- html += template(xrayquire.treeItemHtml, templateData);
- });
-
- //Put the HTML in a full HTML document.
- html = template(xrayquire.treeHtml, {
- content: html
- });
-
- showHtml(html);
- },
-
- getCycles: function (contextName) {
- var context = requirejs.s.contexts[contextName || '_'],
- cycles = {},
- xray = getX(context),
- traced = xray.traced,
- masterVisited = {},
- foundCycle = false;
-
- sortTraceOrder(xray.traceOrder);
-
- each(xray.traceOrder, function (id) {
- var mod = traced[id],
- cycleInfo = findCycle(mod, traced, masterVisited, {});
-
- if (cycleInfo) {
- foundCycle = true;
- mod = cycleInfo.mod;
- mixin(masterVisited, cycleInfo.visited);
-
- cycles[mod.map.id] = {
- visited: cycleInfo.visited
- };
- }
- });
-
- return foundCycle ? cycles : null;
- },
-
- cycleHtml: '\n\n\nModule Cycles\n\n\n\n{content}\n\n\n',
- cycleEntryHtml: '\n',
- cycleChainEntryHtml: '{id}',
-
- showCycles: function (contextName) {
- var cycles = xrayquire.getCycles(contextName),
- html = '';
-
- if (cycles) {
- eachProp(cycles, function (cycle, id) {
- var chainHtml = '';
- eachProp(cycle.visited, function (value, cycleId) {
- if (cycleId !== id) {
- chainHtml += template(xrayquire.cycleChainEntryHtml, {
- id: cycleId
- });
- }
- });
-
- html += template(xrayquire.cycleEntryHtml, {
- id: id,
- chain: chainHtml
- });
- });
- } else {
- html = 'No cycles found';
- }
-
- html = template(xrayquire.cycleHtml, {
- content: html
- });
-
- showHtml(html);
- }
- };
-}());
diff --git a/src/UI/Shims/backbone.marionette.js b/src/UI/Shims/backbone.marionette.js
index 51b86636a..fc4579a11 100644
--- a/src/UI/Shims/backbone.marionette.js
+++ b/src/UI/Shims/backbone.marionette.js
@@ -1,14 +1,10 @@
require('backbone');
-require('../Handlebars/backbone.marionette.templates');
-require('../Mixins/AsNamedView');
require('../JsLibraries/backbone.marionette');
var templateMixin = require('../Handlebars/backbone.marionette.templates');
var asNamedView = require('../Mixins/AsNamedView');
templateMixin.call(window.Marionette.TemplateCache);
-
-
asNamedView.call(window.Marionette.ItemView.prototype);
diff --git a/src/UI/index.html b/src/UI/index.html
index 550610b38..65e2b7bac 100644
--- a/src/UI/index.html
+++ b/src/UI/index.html
@@ -90,5 +90,6 @@
+