' : '';
- html += '| ' + k + '<\/td> | ' + emotify( k ) + '<\/td>';
- html += i % cols == cols - 1 ? '<\/tr>' : '';
- });
-
- while ( ++i % cols ) {
- html += ' | <\/td>';
- }
-
- $('#key').html( '' + html + '<\/table>' );
-
- // Redraw the output.
- $('textarea').keyup();
- };
-
- // When the textarea changes, update the output!
- $('textarea')
- .keyup(function(){
- var text = $(this).val(),
- html = emotify( text );
-
- $('#output').html( html.replace( /\n/g, "
" ) );
-
- })
- .keyup();
-
- // When the select changes, load an Adium Emoticonset!
- $('#choose')
- .change(function(){
- emo_set_load( $(this).val(), emo_set_onload );
- })
- .change();
-
-});
diff --git a/static/js/com.podnoms.player.js b/static/js/com.podnoms.player.js
index 8e372f2..68e627c 100755
--- a/static/js/com.podnoms.player.js
+++ b/static/js/com.podnoms.player.js
@@ -90,12 +90,14 @@ com.podnoms.player = {
$(event.currentTarget).mouseup($.proxy(this._mouseDown, this));
},
_mouseMove: function (event) {
- this.seekHeadEl.show();
- this.seekHeadEl.css('left', (event.pageX) + 'px').fadeIn('fast');
+ this.seekHeadEl.css('left', (event.pageX - this.waveFormLeft));//.fadeIn('fast');
},
_mouseLeave: function (event) {
this.seekHeadEl.hide();
},
+ _mouseEnter: function (event) {
+ this.seekHeadEl.show();
+ },
_destroyCurrent: function (success) {
if (this.currentSound != null) {
soundManager.destroySound(this.currentSound.sID);
@@ -126,6 +128,7 @@ com.podnoms.player = {
this.waveFormEl.mouseup($.proxy(this._mouseDown, this));
this.waveFormEl.mousemove($.proxy(this._mouseMove, this));
this.waveFormEl.mouseout($.proxy(this._mouseLeave, this));
+ this.waveFormEl.mouseenter($.proxy(this._mouseEnter, this));
} else {
console.error("Error setting up player, waveFormEl is empty");
}
diff --git a/static/js/libs/ace/uncompressed/x-editable/ace-editable.js b/static/js/lib/ace-editable.js
similarity index 100%
rename from static/js/libs/ace/uncompressed/x-editable/ace-editable.js
rename to static/js/lib/ace-editable.js
diff --git a/static/js/libs/ace/uncompressed/ace-elements.js b/static/js/lib/ace-elements.js
similarity index 100%
rename from static/js/libs/ace/uncompressed/ace-elements.js
rename to static/js/lib/ace-elements.js
diff --git a/static/js/libs/ace/uncompressed/ace-extra.js b/static/js/lib/ace-extra.js
similarity index 100%
rename from static/js/libs/ace/uncompressed/ace-extra.js
rename to static/js/lib/ace-extra.js
diff --git a/static/js/libs/ace/uncompressed/ace.js b/static/js/lib/ace.js
similarity index 100%
rename from static/js/libs/ace/uncompressed/ace.js
rename to static/js/lib/ace.js
diff --git a/static/js/libs/ajaxfileupload.js b/static/js/lib/ajaxfileupload.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/ajaxfileupload.js
rename to static/js/lib/ajaxfileupload.js
diff --git a/static/js/libs/backbone/backbone.js b/static/js/lib/backbone.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/backbone/backbone.js
rename to static/js/lib/backbone.js
diff --git a/static/js/libs/backbone/backbone.marionette.js b/static/js/lib/backbone.marionette.js
old mode 100755
new mode 100644
similarity index 77%
rename from static/js/libs/backbone/backbone.marionette.js
rename to static/js/lib/backbone.marionette.js
index 6ff513e..9a179f7
--- a/static/js/libs/backbone/backbone.marionette.js
+++ b/static/js/lib/backbone.marionette.js
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
-// v1.0.3
+// v1.1.0
//
// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
@@ -17,24 +17,432 @@
* https://github.com/marionettejs/backbone.wreqr/
*/
-(function (root, factory) {
- if (typeof exports === 'object') {
+// Backbone.BabySitter
+// -------------------
+// v0.0.6
+//
+// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
+// Distributed under MIT license
+//
+// http://github.com/babysitterjs/backbone.babysitter
- var underscore = require('underscore');
- var backbone = require('backbone');
- var wreqr = require('backbone.wreqr');
- var babysitter = require('backbone.babysitter');
+// Backbone.ChildViewContainer
+// ---------------------------
+//
+// Provide a container to store, retrieve and
+// shut down child views.
- module.exports = factory(underscore, backbone, wreqr, babysitter);
+Backbone.ChildViewContainer = (function(Backbone, _){
+
+ // Container Constructor
+ // ---------------------
- } else if (typeof define === 'function' && define.amd) {
+ var Container = function(views){
+ this._views = {};
+ this._indexByModel = {};
+ this._indexByCustom = {};
+ this._updateLength();
- define(['underscore', 'backbone', 'backbone.wreqr', 'backbone.babysitter'], factory);
+ _.each(views, this.add, this);
+ };
- }
-}(this, function (_, Backbone) {
+ // Container Methods
+ // -----------------
- var Marionette = (function(global, Backbone, _){
+ _.extend(Container.prototype, {
+
+ // Add a view to this container. Stores the view
+ // by `cid` and makes it searchable by the model
+ // cid (and model itself). Optionally specify
+ // a custom key to store an retrieve the view.
+ add: function(view, customIndex){
+ var viewCid = view.cid;
+
+ // store the view
+ this._views[viewCid] = view;
+
+ // index it by model
+ if (view.model){
+ this._indexByModel[view.model.cid] = viewCid;
+ }
+
+ // index by custom
+ if (customIndex){
+ this._indexByCustom[customIndex] = viewCid;
+ }
+
+ this._updateLength();
+ },
+
+ // Find a view by the model that was attached to
+ // it. Uses the model's `cid` to find it.
+ findByModel: function(model){
+ return this.findByModelCid(model.cid);
+ },
+
+ // Find a view by the `cid` of the model that was attached to
+ // it. Uses the model's `cid` to find the view `cid` and
+ // retrieve the view using it.
+ findByModelCid: function(modelCid){
+ var viewCid = this._indexByModel[modelCid];
+ return this.findByCid(viewCid);
+ },
+
+ // Find a view by a custom indexer.
+ findByCustom: function(index){
+ var viewCid = this._indexByCustom[index];
+ return this.findByCid(viewCid);
+ },
+
+ // Find by index. This is not guaranteed to be a
+ // stable index.
+ findByIndex: function(index){
+ return _.values(this._views)[index];
+ },
+
+ // retrieve a view by it's `cid` directly
+ findByCid: function(cid){
+ return this._views[cid];
+ },
+
+ // Remove a view
+ remove: function(view){
+ var viewCid = view.cid;
+
+ // delete model index
+ if (view.model){
+ delete this._indexByModel[view.model.cid];
+ }
+
+ // delete custom index
+ _.any(this._indexByCustom, function(cid, key) {
+ if (cid === viewCid) {
+ delete this._indexByCustom[key];
+ return true;
+ }
+ }, this);
+
+ // remove the view from the container
+ delete this._views[viewCid];
+
+ // update the length
+ this._updateLength();
+ },
+
+ // Call a method on every view in the container,
+ // passing parameters to the call method one at a
+ // time, like `function.call`.
+ call: function(method){
+ this.apply(method, _.tail(arguments));
+ },
+
+ // Apply a method on every view in the container,
+ // passing parameters to the call method one at a
+ // time, like `function.apply`.
+ apply: function(method, args){
+ _.each(this._views, function(view){
+ if (_.isFunction(view[method])){
+ view[method].apply(view, args || []);
+ }
+ });
+ },
+
+ // Update the `.length` attribute on this container
+ _updateLength: function(){
+ this.length = _.size(this._views);
+ }
+ });
+
+ // Borrowing this code from Backbone.Collection:
+ // http://backbonejs.org/docs/backbone.html#section-106
+ //
+ // Mix in methods from Underscore, for iteration, and other
+ // collection related features.
+ var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
+ 'select', 'reject', 'every', 'all', 'some', 'any', 'include',
+ 'contains', 'invoke', 'toArray', 'first', 'initial', 'rest',
+ 'last', 'without', 'isEmpty', 'pluck'];
+
+ _.each(methods, function(method) {
+ Container.prototype[method] = function() {
+ var views = _.values(this._views);
+ var args = [views].concat(_.toArray(arguments));
+ return _[method].apply(_, args);
+ };
+ });
+
+ // return the public API
+ return Container;
+})(Backbone, _);
+
+// Backbone.Wreqr (Backbone.Marionette)
+// ----------------------------------
+// v0.2.0
+//
+// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
+// Distributed under MIT license
+//
+// http://github.com/marionettejs/backbone.wreqr
+
+
+Backbone.Wreqr = (function(Backbone, Marionette, _){
+ "use strict";
+ var Wreqr = {};
+
+ // Handlers
+// --------
+// A registry of functions to call, given a name
+
+Wreqr.Handlers = (function(Backbone, _){
+ "use strict";
+
+ // Constructor
+ // -----------
+
+ var Handlers = function(options){
+ this.options = options;
+ this._wreqrHandlers = {};
+
+ if (_.isFunction(this.initialize)){
+ this.initialize(options);
+ }
+ };
+
+ Handlers.extend = Backbone.Model.extend;
+
+ // Instance Members
+ // ----------------
+
+ _.extend(Handlers.prototype, Backbone.Events, {
+
+ // Add multiple handlers using an object literal configuration
+ setHandlers: function(handlers){
+ _.each(handlers, function(handler, name){
+ var context = null;
+
+ if (_.isObject(handler) && !_.isFunction(handler)){
+ context = handler.context;
+ handler = handler.callback;
+ }
+
+ this.setHandler(name, handler, context);
+ }, this);
+ },
+
+ // Add a handler for the given name, with an
+ // optional context to run the handler within
+ setHandler: function(name, handler, context){
+ var config = {
+ callback: handler,
+ context: context
+ };
+
+ this._wreqrHandlers[name] = config;
+
+ this.trigger("handler:add", name, handler, context);
+ },
+
+ // Determine whether or not a handler is registered
+ hasHandler: function(name){
+ return !! this._wreqrHandlers[name];
+ },
+
+ // Get the currently registered handler for
+ // the specified name. Throws an exception if
+ // no handler is found.
+ getHandler: function(name){
+ var config = this._wreqrHandlers[name];
+
+ if (!config){
+ throw new Error("Handler not found for '" + name + "'");
+ }
+
+ return function(){
+ var args = Array.prototype.slice.apply(arguments);
+ return config.callback.apply(config.context, args);
+ };
+ },
+
+ // Remove a handler for the specified name
+ removeHandler: function(name){
+ delete this._wreqrHandlers[name];
+ },
+
+ // Remove all handlers from this registry
+ removeAllHandlers: function(){
+ this._wreqrHandlers = {};
+ }
+ });
+
+ return Handlers;
+})(Backbone, _);
+
+ // Wreqr.CommandStorage
+// --------------------
+//
+// Store and retrieve commands for execution.
+Wreqr.CommandStorage = (function(){
+ "use strict";
+
+ // Constructor function
+ var CommandStorage = function(options){
+ this.options = options;
+ this._commands = {};
+
+ if (_.isFunction(this.initialize)){
+ this.initialize(options);
+ }
+ };
+
+ // Instance methods
+ _.extend(CommandStorage.prototype, Backbone.Events, {
+
+ // Get an object literal by command name, that contains
+ // the `commandName` and the `instances` of all commands
+ // represented as an array of arguments to process
+ getCommands: function(commandName){
+ var commands = this._commands[commandName];
+
+ // we don't have it, so add it
+ if (!commands){
+
+ // build the configuration
+ commands = {
+ command: commandName,
+ instances: []
+ };
+
+ // store it
+ this._commands[commandName] = commands;
+ }
+
+ return commands;
+ },
+
+ // Add a command by name, to the storage and store the
+ // args for the command
+ addCommand: function(commandName, args){
+ var command = this.getCommands(commandName);
+ command.instances.push(args);
+ },
+
+ // Clear all commands for the given `commandName`
+ clearCommands: function(commandName){
+ var command = this.getCommands(commandName);
+ command.instances = [];
+ }
+ });
+
+ return CommandStorage;
+})();
+
+ // Wreqr.Commands
+// --------------
+//
+// A simple command pattern implementation. Register a command
+// handler and execute it.
+Wreqr.Commands = (function(Wreqr){
+ "use strict";
+
+ return Wreqr.Handlers.extend({
+ // default storage type
+ storageType: Wreqr.CommandStorage,
+
+ constructor: function(options){
+ this.options = options || {};
+
+ this._initializeStorage(this.options);
+ this.on("handler:add", this._executeCommands, this);
+
+ var args = Array.prototype.slice.call(arguments);
+ Wreqr.Handlers.prototype.constructor.apply(this, args);
+ },
+
+ // Execute a named command with the supplied args
+ execute: function(name, args){
+ name = arguments[0];
+ args = Array.prototype.slice.call(arguments, 1);
+
+ if (this.hasHandler(name)){
+ this.getHandler(name).apply(this, args);
+ } else {
+ this.storage.addCommand(name, args);
+ }
+
+ },
+
+ // Internal method to handle bulk execution of stored commands
+ _executeCommands: function(name, handler, context){
+ var command = this.storage.getCommands(name);
+
+ // loop through and execute all the stored command instances
+ _.each(command.instances, function(args){
+ handler.apply(context, args);
+ });
+
+ this.storage.clearCommands(name);
+ },
+
+ // Internal method to initialize storage either from the type's
+ // `storageType` or the instance `options.storageType`.
+ _initializeStorage: function(options){
+ var storage;
+
+ var StorageType = options.storageType || this.storageType;
+ if (_.isFunction(StorageType)){
+ storage = new StorageType();
+ } else {
+ storage = StorageType;
+ }
+
+ this.storage = storage;
+ }
+ });
+
+})(Wreqr);
+
+ // Wreqr.RequestResponse
+// ---------------------
+//
+// A simple request/response implementation. Register a
+// request handler, and return a response from it
+Wreqr.RequestResponse = (function(Wreqr){
+ "use strict";
+
+ return Wreqr.Handlers.extend({
+ request: function(){
+ var name = arguments[0];
+ var args = Array.prototype.slice.call(arguments, 1);
+
+ return this.getHandler(name).apply(this, args);
+ }
+ });
+
+})(Wreqr);
+
+ // Event Aggregator
+// ----------------
+// A pub-sub object that can be used to decouple various parts
+// of an application through event-driven architecture.
+
+Wreqr.EventAggregator = (function(Backbone, _){
+ "use strict";
+ var EA = function(){};
+
+ // Copy the `extend` function used by Backbone's classes
+ EA.extend = Backbone.Model.extend;
+
+ // Copy the basic Backbone.Events on to the event aggregator
+ _.extend(EA.prototype, Backbone.Events);
+
+ return EA;
+})(Backbone, _);
+
+
+ return Wreqr;
+})(Backbone, Backbone.Marionette, _);
+
+var Marionette = (function(global, Backbone, _){
"use strict";
// Define and export the Marionette namespace
@@ -83,21 +491,21 @@ Marionette.getOption = function(target, optionName){
return value;
};
-// Trigger an event and a corresponding method name. Examples:
+// Trigger an event and/or a corresponding method name. Examples:
//
// `this.triggerMethod("foo")` will trigger the "foo" event and
-// call the "onFoo" method.
+// call the "onFoo" method.
//
// `this.triggerMethod("foo:bar") will trigger the "foo:bar" event and
// call the "onFooBar" method.
Marionette.triggerMethod = (function(){
-
+
// split the event name on the :
var splitter = /(^|:)(\w)/gi;
// take the event section ("section1:section2:section3")
// and turn it in to uppercase name
- function getEventName(match, prefix, eventName) {
+ function getEventName(match, prefix, eventName) {
return eventName.toUpperCase();
}
@@ -107,8 +515,10 @@ Marionette.triggerMethod = (function(){
var methodName = 'on' + event.replace(splitter, getEventName);
var method = this[methodName];
- // trigger the event
- this.trigger.apply(this, arguments);
+ // trigger the event, if a trigger method exists
+ if(_.isFunction(this.trigger)) {
+ this.trigger.apply(this, arguments);
+ }
// call the onMethodName if it exists
if (_.isFunction(method)) {
@@ -128,14 +538,14 @@ Marionette.triggerMethod = (function(){
// re-rendered.
Marionette.MonitorDOMRefresh = (function(){
- // track when the view has been rendered
+ // track when the view has been shown in the DOM,
+ // using a Marionette.Region (or by other means of triggering "show")
function handleShow(view){
view._isShown = true;
triggerDOMRefresh(view);
}
- // track when the view has been shown in the DOM,
- // using a Marionette.Region (or by other means of triggering "show")
+ // track when the view has been rendered
function handleRender(view){
view._isRendered = true;
triggerDOMRefresh(view);
@@ -374,6 +784,7 @@ _.extend(Marionette.Region, {
// ```
//
buildRegion: function(regionConfig, defaultRegionType){
+
var regionIsString = (typeof regionConfig === "string");
var regionSelectorIsString = (typeof regionConfig.selector === "string");
var regionTypeIsUndefined = (typeof regionConfig.regionType === "undefined");
@@ -820,7 +1231,7 @@ Marionette.View = Backbone.View.extend({
// are copies to the object passed in.
mixinTemplateHelpers: function(target){
target = target || {};
- var templateHelpers = this.templateHelpers;
+ var templateHelpers = Marionette.getOption(this, "templateHelpers");
if (_.isFunction(templateHelpers)){
templateHelpers = templateHelpers.call(this);
}
@@ -950,7 +1361,7 @@ Marionette.View = Backbone.View.extend({
// This method unbinds the elements specified in the "ui" hash
unbindUIElements: function(){
- if (!this.ui){ return; }
+ if (!this.ui || !this._uiBindings){ return; }
// delete all of the existing ui bindings
_.each(this.ui, function($el, name){
@@ -969,7 +1380,13 @@ Marionette.View = Backbone.View.extend({
// A single item view implementation that contains code for rendering
// with underscore.js templates, serializing the view's model or collection,
// and calling several methods on extended views, such as `onRender`.
-Marionette.ItemView = Marionette.View.extend({
+Marionette.ItemView = Marionette.View.extend({
+
+ // Setting up the inheritance chain which allows changes to
+ // Marionette.View.prototype.constructor which allows overriding
+ constructor: function(){
+ Marionette.View.prototype.constructor.apply(this, slice(arguments));
+ },
// Serialize the model or collection for the view. If a model is
// found, `.toJSON()` is called. If a collection is found, `.toJSON()`
@@ -1301,6 +1718,12 @@ Marionette.CollectionView = Marionette.View.extend({
// an item view as `modelView`, for the top leaf
Marionette.CompositeView = Marionette.CollectionView.extend({
+ // Setting up the inheritance chain which allows changes to
+ // Marionette.CollectionView.prototype.constructor which allows overriding
+ constructor: function(){
+ Marionette.CollectionView.prototype.constructor.apply(this, slice(arguments));
+ },
+
// Configured the initial events that the composite view
// binds to. Override this method to prevent the initial
// events, or to add your own initial events.
@@ -1326,7 +1749,7 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
return itemView;
},
- // Serialize the collection for the view.
+ // Serialize the collection for the view.
// You can override the `serializeData` method in your own view
// definition, to provide custom serialization for your view's data.
serializeData: function(){
@@ -1350,7 +1773,7 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
this.triggerBeforeRender();
var html = this.renderModel();
this.$el.html(html);
- // the ui bindings is done here and not at the end of render since they
+ // the ui bindings is done here and not at the end of render since they
// will not be available until after the model is rendered, but should be
// available before the collection is rendered.
this.bindUIElements();
@@ -1399,9 +1822,10 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
}
var container;
- if (containerView.itemViewContainer){
+ var itemViewContainer = Marionette.getOption(containerView, "itemViewContainer");
+ if (itemViewContainer){
- var selector = _.result(containerView, "itemViewContainer");
+ var selector = _.isFunction(itemViewContainer) ? itemViewContainer() : itemViewContainer;
container = containerView.$(selector);
if (container.length <= 0) {
throwError("The specified `itemViewContainer` was not found: " + containerView.itemViewContainer, "ItemViewContainerMissingError");
@@ -1444,7 +1868,7 @@ Marionette.Layout = Marionette.ItemView.extend({
this._firstRender = true;
this._initializeRegions(options);
- Marionette.ItemView.call(this, options);
+ Marionette.ItemView.prototype.constructor.call(this, options);
},
// Layout's render will use the existing region objects the
@@ -1453,15 +1877,16 @@ Marionette.Layout = Marionette.ItemView.extend({
// for the regions to the newly rendered DOM elements.
render: function(){
- if (this._firstRender){
- // if this is the first render, don't do anything to
- // reset the regions
- this._firstRender = false;
- } else if (this.isClosed){
+ if (this.isClosed){
// a previously closed layout means we need to
// completely re-initialize the regions
this._initializeRegions();
- } else {
+ }
+ if (this._firstRender) {
+ // if this is the first render, don't do anything to
+ // reset the regions
+ this._firstRender = false;
+ } else if (!this.isClosed){
// If this is not the first render call, then we need to
// re-initializing the `el` for each region
this._reInitializeRegions();
@@ -1485,17 +1910,18 @@ Marionette.Layout = Marionette.ItemView.extend({
addRegion: function(name, definition){
var regions = {};
regions[name] = definition;
- return this.addRegions(regions)[name];
+ return this._buildRegions(regions)[name];
},
// Add multiple regions as a {name: definition, name2: def2} object literal
addRegions: function(regions){
- this.regions = _.extend(this.regions || {}, regions);
+ this.regions = _.extend({}, this.regions, regions);
return this._buildRegions(regions);
},
// Remove a single region from the Layout, by name
removeRegion: function(name){
+ delete this.regions[name];
return this.regionManager.removeRegion(name);
},
@@ -1504,6 +1930,7 @@ Marionette.Layout = Marionette.ItemView.extend({
var that = this;
var defaults = {
+ regionType: Marionette.getOption(this, "regionType"),
parentEl: function(){ return that.$el; }
};
@@ -1574,31 +2001,46 @@ Marionette.AppRouter = Backbone.Router.extend({
constructor: function(options){
Backbone.Router.prototype.constructor.apply(this, slice(arguments));
+
+ this.options = options || {};
- this.options = options;
+ var appRoutes = Marionette.getOption(this, "appRoutes");
+ var controller = this._getController();
+ this.processAppRoutes(controller, appRoutes);
+ },
- if (this.appRoutes){
- var controller = Marionette.getOption(this, "controller");
- this.processAppRoutes(controller, this.appRoutes);
- }
+ // Similar to route method on a Backbone Router but
+ // method is called on the controller
+ appRoute: function(route, methodName) {
+ var controller = this._getController();
+ this._addAppRoute(controller, route, methodName);
},
// Internal method to process the `appRoutes` for the
// router, and turn them in to routes that trigger the
// specified method on the specified `controller`.
processAppRoutes: function(controller, appRoutes) {
+ if (!appRoutes){ return; }
+
var routeNames = _.keys(appRoutes).reverse(); // Backbone requires reverted order of routes
_.each(routeNames, function(route) {
- var methodName = appRoutes[route];
- var method = controller[methodName];
-
- if (!method) {
- throw new Error("Method '" + methodName + "' was not found on the controller");
- }
-
- this.route(route, methodName, _.bind(method, controller));
+ this._addAppRoute(controller, route, appRoutes[route]);
}, this);
+ },
+
+ _getController: function(){
+ return Marionette.getOption(this, "controller");
+ },
+
+ _addAppRoute: function(controller, route, methodName){
+ var method = controller[methodName];
+
+ if (!method) {
+ throw new Error("Method '" + methodName + "' was not found on the controller");
+ }
+
+ this.route(route, methodName, _.bind(method, controller));
}
});
@@ -1661,12 +2103,24 @@ _.extend(Marionette.Application.prototype, Backbone.Events, {
return this._regionManager.addRegions(regions);
},
- // Removes a region from your app.
+ // Close all regions in the app, without removing them
+ closeRegions: function(){
+ this._regionManager.closeRegions();
+ },
+
+ // Removes a region from your app, by name
// Accepts the regions name
// removeRegion('myRegion')
removeRegion: function(region) {
this._regionManager.removeRegion(region);
},
+
+ // Provides alternative access to regions
+ // Accepts the region name
+ // getRegion('main')
+ getRegion: function(region) {
+ return this._regionManager.get(region);
+ },
// Create a module, attached to the application
module: function(moduleNames, moduleDefinition){
@@ -1903,11 +2357,5 @@ _.extend(Marionette.Module, {
}
});
-
-
return Marionette;
-})(this, Backbone, _);
-
- return Backbone.Marionette;
-
-}));
\ No newline at end of file
+})(this, Backbone, _);
\ No newline at end of file
diff --git a/static/js/libs/backbone/backbone.syphon.js b/static/js/lib/backbone.syphon.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/backbone/backbone.syphon.js
rename to static/js/lib/backbone.syphon.js
diff --git a/static/js/libs/backbone/backbone.wreqr.js b/static/js/lib/backbone.wreqr.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/backbone/backbone.wreqr.js
rename to static/js/lib/backbone.wreqr.js
diff --git a/static/js/libs/ace/uncompressed/x-editable/bootstrap-editable.js b/static/js/lib/bootstrap-editable.js
similarity index 100%
rename from static/js/libs/ace/uncompressed/x-editable/bootstrap-editable.js
rename to static/js/lib/bootstrap-editable.js
diff --git a/static/js/libs/ace/bootstrap-tag.min.js b/static/js/lib/bootstrap-tag.min.js
similarity index 100%
rename from static/js/libs/ace/bootstrap-tag.min.js
rename to static/js/lib/bootstrap-tag.min.js
diff --git a/static/js/libs/bootstrap/bootstrap-typeahead.js b/static/js/lib/bootstrap-typeahead.js
similarity index 100%
rename from static/js/libs/bootstrap/bootstrap-typeahead.js
rename to static/js/lib/bootstrap-typeahead.js
diff --git a/static/js/libs/ace/uncompressed/bootstrap-wysiwyg.js b/static/js/lib/bootstrap-wysiwyg.js
similarity index 100%
rename from static/js/libs/ace/uncompressed/bootstrap-wysiwyg.js
rename to static/js/lib/bootstrap-wysiwyg.js
diff --git a/static/js/libs/ace/uncompressed/bootstrap.js b/static/js/lib/bootstrap.js
similarity index 100%
rename from static/js/libs/ace/uncompressed/bootstrap.js
rename to static/js/lib/bootstrap.js
diff --git a/static/js/libs/canvas-to-blob.js b/static/js/lib/canvas-to-blob.js
similarity index 100%
rename from static/js/libs/canvas-to-blob.js
rename to static/js/lib/canvas-to-blob.js
diff --git a/static/js/libs/upload/jquery.fileupload-audio.js b/static/js/lib/jquery.fileupload-audio.js
similarity index 100%
rename from static/js/libs/upload/jquery.fileupload-audio.js
rename to static/js/lib/jquery.fileupload-audio.js
diff --git a/static/js/libs/upload/jquery.fileupload-image.js b/static/js/lib/jquery.fileupload-image.js
similarity index 100%
rename from static/js/libs/upload/jquery.fileupload-image.js
rename to static/js/lib/jquery.fileupload-image.js
diff --git a/static/js/libs/upload/jquery.fileupload-process.js b/static/js/lib/jquery.fileupload-process.js
similarity index 100%
rename from static/js/libs/upload/jquery.fileupload-process.js
rename to static/js/lib/jquery.fileupload-process.js
diff --git a/static/js/libs/upload/jquery.fileupload-ui.js b/static/js/lib/jquery.fileupload-ui.js
similarity index 100%
rename from static/js/libs/upload/jquery.fileupload-ui.js
rename to static/js/lib/jquery.fileupload-ui.js
diff --git a/static/js/libs/upload/jquery.fileupload-validate.js b/static/js/lib/jquery.fileupload-validate.js
similarity index 100%
rename from static/js/libs/upload/jquery.fileupload-validate.js
rename to static/js/lib/jquery.fileupload-validate.js
diff --git a/static/js/libs/upload/jquery.fileupload-video.js b/static/js/lib/jquery.fileupload-video.js
similarity index 100%
rename from static/js/libs/upload/jquery.fileupload-video.js
rename to static/js/lib/jquery.fileupload-video.js
diff --git a/static/js/libs/upload/jquery.fileupload.js b/static/js/lib/jquery.fileupload.js
similarity index 100%
rename from static/js/libs/upload/jquery.fileupload.js
rename to static/js/lib/jquery.fileupload.js
diff --git a/static/js/libs/ace/uncompressed/jquery.hotkeys.js b/static/js/lib/jquery.hotkeys.js
similarity index 100%
rename from static/js/libs/ace/uncompressed/jquery.hotkeys.js
rename to static/js/lib/jquery.hotkeys.js
diff --git a/static/js/libs/jquery.iframe-transport.js b/static/js/lib/jquery.iframe-transport.js
similarity index 100%
rename from static/js/libs/jquery.iframe-transport.js
rename to static/js/lib/jquery.iframe-transport.js
diff --git a/static/js/libs/jquery.js b/static/js/lib/jquery.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/jquery.js
rename to static/js/lib/jquery.js
diff --git a/static/js/libs/jquery.ui.widget.js b/static/js/lib/jquery.ui.widget.js
similarity index 100%
rename from static/js/libs/jquery.ui.widget.js
rename to static/js/lib/jquery.ui.widget.js
diff --git a/static/js/libs/upload/load-image-exif.js b/static/js/lib/load-image-exif.js
similarity index 100%
rename from static/js/libs/upload/load-image-exif.js
rename to static/js/lib/load-image-exif.js
diff --git a/static/js/libs/upload/load-image-ios.js b/static/js/lib/load-image-ios.js
similarity index 100%
rename from static/js/libs/upload/load-image-ios.js
rename to static/js/lib/load-image-ios.js
diff --git a/static/js/libs/upload/load-image-meta.js b/static/js/lib/load-image-meta.js
similarity index 100%
rename from static/js/libs/upload/load-image-meta.js
rename to static/js/lib/load-image-meta.js
diff --git a/static/js/libs/upload/load-image.js b/static/js/lib/load-image.js
similarity index 100%
rename from static/js/libs/upload/load-image.js
rename to static/js/lib/load-image.js
diff --git a/static/js/libs/moment.js b/static/js/lib/moment.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/moment.js
rename to static/js/lib/moment.js
diff --git a/static/js/libs/require.js b/static/js/lib/require.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/require.js
rename to static/js/lib/require.js
diff --git a/static/js/libs/select2.js b/static/js/lib/select2.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/select2.js
rename to static/js/lib/select2.js
diff --git a/static/js/libs/sm/soundmanager2-nodebug.js b/static/js/lib/sm/soundmanager2-nodebug.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/sm/soundmanager2-nodebug.js
rename to static/js/lib/sm/soundmanager2-nodebug.js
diff --git a/static/js/libs/sm/soundmanager2.js b/static/js/lib/sm/soundmanager2.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/sm/soundmanager2.js
rename to static/js/lib/sm/soundmanager2.js
diff --git a/static/js/libs/text.js b/static/js/lib/text.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/text.js
rename to static/js/lib/text.js
diff --git a/static/js/libs/upload/tmpl.js b/static/js/lib/tmpl.js
similarity index 100%
rename from static/js/libs/upload/tmpl.js
rename to static/js/lib/tmpl.js
diff --git a/static/js/libs/toastr.js b/static/js/lib/toastr.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/toastr.js
rename to static/js/lib/toastr.js
diff --git a/static/js/libs/backbone/underscore.js b/static/js/lib/underscore.js
old mode 100755
new mode 100644
similarity index 100%
rename from static/js/libs/backbone/underscore.js
rename to static/js/lib/underscore.js
diff --git a/static/js/libs/ICanHaz.js b/static/js/libs/ICanHaz.js
deleted file mode 100755
index d24deb6..0000000
--- a/static/js/libs/ICanHaz.js
+++ /dev/null
@@ -1,552 +0,0 @@
-/*!
-ICanHaz.js version 0.10.2 -- by @HenrikJoreteg
-More info at: http://icanhazjs.com
-*/
-(function () {
-/*
- mustache.js — Logic-less templates in JavaScript
-
- See http://mustache.github.com/ for more info.
-*/
-
-var Mustache = function () {
- var _toString = Object.prototype.toString;
-
- Array.isArray = Array.isArray || function (obj) {
- return _toString.call(obj) == "[object Array]";
- }
-
- var _trim = String.prototype.trim, trim;
-
- if (_trim) {
- trim = function (text) {
- return text == null ? "" : _trim.call(text);
- }
- } else {
- var trimLeft, trimRight;
-
- // IE doesn't match non-breaking spaces with \s.
- if ((/\S/).test("\xA0")) {
- trimLeft = /^[\s\xA0]+/;
- trimRight = /[\s\xA0]+$/;
- } else {
- trimLeft = /^\s+/;
- trimRight = /\s+$/;
- }
-
- trim = function (text) {
- return text == null ? "" :
- text.toString().replace(trimLeft, "").replace(trimRight, "");
- }
- }
-
- var escapeMap = {
- "&": "&",
- "<": "<",
- ">": ">",
- '"': '"',
- "'": '''
- };
-
- function escapeHTML(string) {
- return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) {
- return escapeMap[s] || s;
- });
- }
-
- var regexCache = {};
- var Renderer = function () {};
-
- Renderer.prototype = {
- otag: "{{",
- ctag: "}}",
- pragmas: {},
- buffer: [],
- pragmas_implemented: {
- "IMPLICIT-ITERATOR": true
- },
- context: {},
-
- render: function (template, context, partials, in_recursion) {
- // reset buffer & set context
- if (!in_recursion) {
- this.context = context;
- this.buffer = []; // TODO: make this non-lazy
- }
-
- // fail fast
- if (!this.includes("", template)) {
- if (in_recursion) {
- return template;
- } else {
- this.send(template);
- return;
- }
- }
-
- // get the pragmas together
- template = this.render_pragmas(template);
-
- // render the template
- var html = this.render_section(template, context, partials);
-
- // render_section did not find any sections, we still need to render the tags
- if (html === false) {
- html = this.render_tags(template, context, partials, in_recursion);
- }
-
- if (in_recursion) {
- return html;
- } else {
- this.sendLines(html);
- }
- },
-
- /*
- Sends parsed lines
- */
- send: function (line) {
- if (line !== "") {
- this.buffer.push(line);
- }
- },
-
- sendLines: function (text) {
- if (text) {
- var lines = text.split("\n");
- for (var i = 0; i < lines.length; i++) {
- this.send(lines[i]);
- }
- }
- },
-
- /*
- Looks for %PRAGMAS
- */
- render_pragmas: function (template) {
- // no pragmas
- if (!this.includes("%", template)) {
- return template;
- }
-
- var that = this;
- var regex = this.getCachedRegex("render_pragmas", function (otag, ctag) {
- return new RegExp(otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" + ctag, "g");
- });
-
- return template.replace(regex, function (match, pragma, options) {
- if (!that.pragmas_implemented[pragma]) {
- throw({message:
- "This implementation of mustache doesn't understand the '" +
- pragma + "' pragma"});
- }
- that.pragmas[pragma] = {};
- if (options) {
- var opts = options.split("=");
- that.pragmas[pragma][opts[0]] = opts[1];
- }
- return "";
- // ignore unknown pragmas silently
- });
- },
-
- /*
- Tries to find a partial in the curent scope and render it
- */
- render_partial: function (name, context, partials) {
- name = trim(name);
- if (!partials || partials[name] === undefined) {
- throw({message: "unknown_partial '" + name + "'"});
- }
- if (!context || typeof context[name] != "object") {
- return this.render(partials[name], context, partials, true);
- }
- return this.render(partials[name], context[name], partials, true);
- },
-
- /*
- Renders inverted (^) and normal (#) sections
- */
- render_section: function (template, context, partials) {
- if (!this.includes("#", template) && !this.includes("^", template)) {
- // did not render anything, there were no sections
- return false;
- }
-
- var that = this;
-
- var regex = this.getCachedRegex("render_section", function (otag, ctag) {
- // This regex matches _the first_ section ({{#foo}}{{/foo}}), and captures the remainder
- return new RegExp(
- "^([\\s\\S]*?)" + // all the crap at the beginning that is not {{*}} ($1)
-
- otag + // {{
- "(\\^|\\#)\\s*(.+)\\s*" + // #foo (# == $2, foo == $3)
- ctag + // }}
-
- "\n*([\\s\\S]*?)" + // between the tag ($2). leading newlines are dropped
-
- otag + // {{
- "\\/\\s*\\3\\s*" + // /foo (backreference to the opening tag).
- ctag + // }}
-
- "\\s*([\\s\\S]*)$", // everything else in the string ($4). leading whitespace is dropped.
-
- "g");
- });
-
-
- // for each {{#foo}}{{/foo}} section do...
- return template.replace(regex, function (match, before, type, name, content, after) {
- // before contains only tags, no sections
- var renderedBefore = before ? that.render_tags(before, context, partials, true) : "",
-
- // after may contain both sections and tags, so use full rendering function
- renderedAfter = after ? that.render(after, context, partials, true) : "",
-
- // will be computed below
- renderedContent,
-
- value = that.find(name, context);
-
- if (type === "^") { // inverted section
- if (!value || Array.isArray(value) && value.length === 0) {
- // false or empty list, render it
- renderedContent = that.render(content, context, partials, true);
- } else {
- renderedContent = "";
- }
- } else if (type === "#") { // normal section
- if (Array.isArray(value)) { // Enumerable, Let's loop!
- renderedContent = that.map(value, function (row) {
- return that.render(content, that.create_context(row), partials, true);
- }).join("");
- } else if (that.is_object(value)) { // Object, Use it as subcontext!
- renderedContent = that.render(content, that.create_context(value),
- partials, true);
- } else if (typeof value == "function") {
- // higher order section
- renderedContent = value.call(context, content, function (text) {
- return that.render(text, context, partials, true);
- });
- } else if (value) { // boolean section
- renderedContent = that.render(content, context, partials, true);
- } else {
- renderedContent = "";
- }
- }
-
- return renderedBefore + renderedContent + renderedAfter;
- });
- },
-
- /*
- Replace {{foo}} and friends with values from our view
- */
- render_tags: function (template, context, partials, in_recursion) {
- // tit for tat
- var that = this;
-
- var new_regex = function () {
- return that.getCachedRegex("render_tags", function (otag, ctag) {
- return new RegExp(otag + "(=|!|>|&|\\{|%)?([^#\\^]+?)\\1?" + ctag + "+", "g");
- });
- };
-
- var regex = new_regex();
- var tag_replace_callback = function (match, operator, name) {
- switch(operator) {
- case "!": // ignore comments
- return "";
- case "=": // set new delimiters, rebuild the replace regexp
- that.set_delimiters(name);
- regex = new_regex();
- return "";
- case ">": // render partial
- return that.render_partial(name, context, partials);
- case "{": // the triple mustache is unescaped
- case "&": // & operator is an alternative unescape method
- return that.find(name, context);
- default: // escape the value
- return escapeHTML(that.find(name, context));
- }
- };
- var lines = template.split("\n");
- for(var i = 0; i < lines.length; i++) {
- lines[i] = lines[i].replace(regex, tag_replace_callback, this);
- if (!in_recursion) {
- this.send(lines[i]);
- }
- }
-
- if (in_recursion) {
- return lines.join("\n");
- }
- },
-
- set_delimiters: function (delimiters) {
- var dels = delimiters.split(" ");
- this.otag = this.escape_regex(dels[0]);
- this.ctag = this.escape_regex(dels[1]);
- },
-
- escape_regex: function (text) {
- // thank you Simon Willison
- if (!arguments.callee.sRE) {
- var specials = [
- '/', '.', '*', '+', '?', '|',
- '(', ')', '[', ']', '{', '}', '\\'
- ];
- arguments.callee.sRE = new RegExp(
- '(\\' + specials.join('|\\') + ')', 'g'
- );
- }
- return text.replace(arguments.callee.sRE, '\\$1');
- },
-
- /*
- find `name` in current `context`. That is find me a value
- from the view object
- */
- find: function (name, context) {
- name = trim(name);
-
- // Checks whether a value is thruthy or false or 0
- function is_kinda_truthy(bool) {
- return bool === false || bool === 0 || bool;
- }
-
- var value;
-
- // check for dot notation eg. foo.bar
- if (name.match(/([a-z_]+)\./ig)) {
- var childValue = this.walk_context(name, context);
- if (is_kinda_truthy(childValue)) {
- value = childValue;
- }
- } else {
- if (is_kinda_truthy(context[name])) {
- value = context[name];
- } else if (is_kinda_truthy(this.context[name])) {
- value = this.context[name];
- }
- }
-
- if (typeof value == "function") {
- return value.apply(context);
- }
- if (value !== undefined) {
- return value;
- }
- // silently ignore unkown variables
- return "";
- },
-
- walk_context: function (name, context) {
- var path = name.split('.');
- // if the var doesn't exist in current context, check the top level context
- var value_context = (context[path[0]] != undefined) ? context : this.context;
- var value = value_context[path.shift()];
- while (value != undefined && path.length > 0) {
- value_context = value;
- value = value[path.shift()];
- }
- // if the value is a function, call it, binding the correct context
- if (typeof value == "function") {
- return value.apply(value_context);
- }
- return value;
- },
-
- // Utility methods
-
- /* includes tag */
- includes: function (needle, haystack) {
- return haystack.indexOf(this.otag + needle) != -1;
- },
-
- // by @langalex, support for arrays of strings
- create_context: function (_context) {
- if (this.is_object(_context)) {
- return _context;
- } else {
- var iterator = ".";
- if (this.pragmas["IMPLICIT-ITERATOR"]) {
- iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator;
- }
- var ctx = {};
- ctx[iterator] = _context;
- return ctx;
- }
- },
-
- is_object: function (a) {
- return a && typeof a == "object";
- },
-
- /*
- Why, why, why? Because IE. Cry, cry cry.
- */
- map: function (array, fn) {
- if (typeof array.map == "function") {
- return array.map(fn);
- } else {
- var r = [];
- var l = array.length;
- for(var i = 0; i < l; i++) {
- r.push(fn(array[i]));
- }
- return r;
- }
- },
-
- getCachedRegex: function (name, generator) {
- var byOtag = regexCache[this.otag];
- if (!byOtag) {
- byOtag = regexCache[this.otag] = {};
- }
-
- var byCtag = byOtag[this.ctag];
- if (!byCtag) {
- byCtag = byOtag[this.ctag] = {};
- }
-
- var regex = byCtag[name];
- if (!regex) {
- regex = byCtag[name] = generator(this.otag, this.ctag);
- }
-
- return regex;
- }
- };
-
- return({
- name: "mustache.js",
- version: "0.4.0",
-
- /*
- Turns a template and view into HTML
- */
- to_html: function (template, view, partials, send_fun) {
- var renderer = new Renderer();
- if (send_fun) {
- renderer.send = send_fun;
- }
- renderer.render(template, view || {}, partials);
- if (!send_fun) {
- return renderer.buffer.join("\n");
- }
- }
- });
-}();
-/*!
- ICanHaz.js -- by @HenrikJoreteg
-*/
-/*global */
-(function () {
- function trim(stuff) {
- if (''.trim) return stuff.trim();
- else return stuff.replace(/^\s+/, '').replace(/\s+$/, '');
- }
-
- // Establish the root object, `window` in the browser, or `global` on the server.
- var root = this;
-
- var ich = {
- VERSION: "0.10.2",
- templates: {},
-
- // grab jquery or zepto if it's there
- $: (typeof window !== 'undefined') ? window.jQuery || window.Zepto || null : null,
-
- // public function for adding templates
- // can take a name and template string arguments
- // or can take an object with name/template pairs
- // We're enforcing uniqueness to avoid accidental template overwrites.
- // If you want a different template, it should have a different name.
- addTemplate: function (name, templateString) {
- if (typeof name === 'object') {
- for (var template in name) {
- this.addTemplate(template, name[template]);
- }
- return;
- }
- if (ich[name]) {
- console.error("Invalid name: " + name + ".");
- } else if (ich.templates[name]) {
- console.error("Template \"" + name + " \" exists");
- } else {
- ich.templates[name] = templateString;
- ich[name] = function (data, raw) {
- data = data || {};
- var result = Mustache.to_html(ich.templates[name], data, ich.templates);
- return (ich.$ && !raw) ? ich.$(trim(result)) : result;
- };
- }
- },
-
- // clears all retrieval functions and empties cache
- clearAll: function () {
- for (var key in ich.templates) {
- delete ich[key];
- }
- ich.templates = {};
- },
-
- // clears/grabs
- refresh: function () {
- ich.clearAll();
- ich.grabTemplates();
- },
-
- // grabs templates from the DOM and caches them.
- // Loop through and add templates.
- // Whitespace at beginning and end of all templates inside
-
-
-
-
-
- SoundManager 2 / page as a playlist, basic
- template (flash 8)
-
-
-
-
-
-
-
-
- |