added extension.js, trying to add legacy sprites for tree icons, updates tree icon filters (still not working)

This commit is contained in:
Shannon Deminick
2013-06-02 20:34:06 -10:00
parent 4a24abca17
commit dd3490a2ab
13 changed files with 636 additions and 25 deletions

View File

@@ -1,6 +1,6 @@
require.config("##RequireJsConfig##");
require("##RequireJsInitialize##", function (angular, app) {
require("##RequireJsInitialize##", function (angular, app, jQuery) {
//This function will be called when all the dependencies
//listed above are loaded. Note that this function could

View File

@@ -4,6 +4,7 @@
paths: {
jquery: '../lib/jquery/jquery-1.8.2.min',
jqueryCookie: '../lib/jquery/jquery.cookie',
umbracoExtensions: '../lib/umbraco/extensions',
bootstrap: '../lib/bootstrap/js/bootstrap',
underscore: '../lib/underscore/underscore',
angular: '../lib/angular/angular.min',
@@ -21,6 +22,7 @@
css: '../lib/require/css'
},
shim: {
'umbracoExtensions' : {'exports' : 'umbracoExtensions'},
'angular' : {'exports' : 'angular'},
'angular-resource': { deps: ['angular'] },
'bootstrap': { deps: ['jquery'] },

View File

@@ -1,8 +1,9 @@
[
[
'angular',
'app',
'app',
'jquery',
'jqueryCookie',
'umbracoExtensions',
'bootstrap',
'umbraco.resources',
'umbraco.directives',