fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2025-12-28 20:49:08 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Altered js comression in main to check if uploads work again

Browse Source
This commit is contained in:
Fergal Moran
2013-08-22 19:49:38 +01:00
parent 4da826fd45
commit 2ad6fa4a2e
4 changed files with 35 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dss/pipelinesettings.py Normal file
View File

@@ -0,0 +1,8 @@
from dss import localsettings
COMPRESS_ENABLED = localsettings.COMPRESS_ENABLED
REQUIRE_BASE_URL = "js"
REQUIRE_JS = "libs/require.js"
REQUIRE_DEBUG = localsettings.DEBUG
REQUIRE_ENVIRONMENT = "auto"
REQUIRE_BUILD_PROFILE = "app.build.js"

9
dss/settings.py
View File

@@ -250,10 +250,6 @@ EMAIL_PORT = localsettings.EMAIL_PORT
DEFAULT_FROM_EMAIL = 'DSS ChatBot <chatbot@deepsouthsounds.com>'
DEFAULT_HTTP_PROTOCOL = 'http'
REQUIRE_BASE_URL = "js"
REQUIRE_JS = "libs/require.js"
REQUIRE_DEBUG = DEBUG
if DEBUG:
import mimetypes
@@ -261,6 +257,7 @@ if DEBUG:
mimetypes.add_type("font/woff", ".woff", True)
# TODO(fergal.moran@gmail.com): #import localsettings - so all localsettings are part of import settings
REALTIME_HEADERS = {
'content-type': 'application/json'
}
@@ -278,4 +275,6 @@ if 'test' in sys.argv:
pass
COMPRESS_ENABLED = localsettings.COMPRESS_ENABLED
from pipelinesettings import *

70
static/js/libs/require.js
View File

@@ -1,5 +1,5 @@
/** vim: et:ts=4:sw=4:sts=4
* @license RequireJS 2.1.6 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* @license RequireJS 2.1.5 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
@@ -12,7 +12,7 @@ var requirejs, require, define;
(function (global) {
var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath,
version = '2.1.6',
version = '2.1.5',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
@@ -22,7 +22,7 @@ var requirejs, require, define;
hasOwn = op.hasOwnProperty,
ap = Array.prototype,
apsp = ap.splice,
isBrowser = !!(typeof window !== 'undefined' && navigator && window.document),
isBrowser = !!(typeof window !== 'undefined' && navigator && document),
isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
//PS3 indicates loaded and complete, but need to wait for complete
//specifically. Sequence is 'loading', 'loaded', execution,
@@ -134,10 +134,6 @@ var requirejs, require, define;
return document.getElementsByTagName('script');
}
function defaultOnError(err) {
throw err;
}
//Allow getting a global that expressed in
//dot notation, like 'a.b.c'.
function getGlobal(value) {
@@ -504,12 +500,7 @@ var requirejs, require, define;
fn(defined[id]);
}
} else {
mod = getModule(depMap);
if (mod.error && name === 'error') {
fn(mod.error);
} else {
mod.on(name, fn);
}
getModule(depMap).on(name, fn);
}
}
@@ -580,13 +571,7 @@ var requirejs, require, define;
id: mod.map.id,
uri: mod.map.url,
config: function () {
var c,
pkg = getOwn(config.pkgs, mod.map.id);
// For packages, only support config targeted
// at the main module.
c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) :
getOwn(config.config, mod.map.id);
return c || {};
return (config.config && getOwn(config.config, mod.map.id)) || {};
},
exports: defined[mod.map.id]
});
@@ -855,13 +840,8 @@ var requirejs, require, define;
if (this.depCount < 1 && !this.defined) {
if (isFunction(factory)) {
//If there is an error listener, favor passing
//to that instead of throwing an error. However,
//only do it for define()'d modules. require
//errbacks should not be called for failures in
//their callbacks (#699). However if a global
//onError is set, use that.
if ((this.events.error && this.map.isDefine) ||
req.onError !== defaultOnError) {
//to that instead of throwing an error.
if (this.events.error) {
try {
exports = context.execCb(id, factory, depExports, exports);
} catch (e) {
@@ -889,8 +869,8 @@ var requirejs, require, define;
if (err) {
err.requireMap = this.map;
err.requireModules = this.map.isDefine ? [this.map.id] : null;
err.requireType = this.map.isDefine ? 'define' : 'require';
err.requireModules = [this.map.id];
err.requireType = 'define';
return onError((this.error = err));
}
@@ -1113,7 +1093,7 @@ var requirejs, require, define;
}));
if (this.errback) {
on(depMap, 'error', bind(this, this.errback));
on(depMap, 'error', this.errback);
}
}
@@ -1625,7 +1605,7 @@ var requirejs, require, define;
},
/**
* Executes a module callback function. Broken out as a separate function
* Executes a module callack function. Broken out as a separate function
* solely to allow the build system to sequence the files in the built
* layer in the right sequence.
*
@@ -1663,7 +1643,7 @@ var requirejs, require, define;
onScriptError: function (evt) {
var data = getScriptData(evt);
if (!hasPathFallback(data.id)) {
return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
return onError(makeError('scripterror', 'Script error', evt, [data.id]));
}
}
};
@@ -1792,7 +1772,9 @@ var requirejs, require, define;
* function. Intercept/override it if you want custom error handling.
* @param {Error} err the error object.
*/
req.onError = defaultOnError;
req.onError = function (err) {
throw err;
};
/**
* Does the request to load a module for the browser case.
@@ -1924,31 +1906,24 @@ var requirejs, require, define;
//baseUrl, if it is not already set.
dataMain = script.getAttribute('data-main');
if (dataMain) {
//Preserve dataMain in case it is a path (i.e. contains '?')
mainScript = dataMain;
//Set final baseUrl if there is not already an explicit one.
if (!cfg.baseUrl) {
//Pull off the directory of data-main for use as the
//baseUrl.
src = mainScript.split('/');
src = dataMain.split('/');
mainScript = src.pop();
subPath = src.length ? src.join('/') + '/' : './';
cfg.baseUrl = subPath;
dataMain = mainScript;
}
//Strip off any trailing .js since mainScript is now
//Strip off any trailing .js since dataMain is now
//like a module name.
mainScript = mainScript.replace(jsSuffixRegExp, '');
//If mainScript is still a path, fall back to dataMain
if (req.jsExtRegExp.test(mainScript)) {
mainScript = dataMain;
}
dataMain = dataMain.replace(jsSuffixRegExp, '');
//Put the data-main script in the files to load.
cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain];
return true;
}
@@ -1976,13 +1951,12 @@ var requirejs, require, define;
//This module may not have dependencies
if (!isArray(deps)) {
callback = deps;
deps = null;
deps = [];
}
//If no name, and callback is a function, then figure out if it a
//CommonJS thing with dependencies.
if (!deps && isFunction(callback)) {
deps = [];
if (!deps.length && isFunction(callback)) {
//Remove comments from the callback string,
//look for require calls, and pull them into the dependencies,
//but only if there are function args.

2
templates/base.html
View File

@@ -45,7 +45,6 @@
</body>
<script src="/js/settings/"></script>
{% require_module 'main' %}
{% compress js %}
{% if DEBUG %}
<script src="{{ STATIC_URL }}js/libs/sm/soundmanager2.js"></script>
{% else %}
@@ -54,6 +53,7 @@
<script src="{{ STATIC_URL }}js/libs/modernizr.js"></script>
<script src="{{ STATIC_URL }}js/com.podnoms.storage.js"></script>
<script src="{{ STATIC_URL }}js/com.podnoms.player.js"></script>
{% compress js %}
{% endcompress %}
{% block footerscripts %}
{% endblock %}