Merge branch 'development'

Conflicts:
	example/package.json
	test/Scripts/typings/leaflet/leaflet.d.ts

.gitignore

@@ -11,6 +11,8 @@ csCompTests/csComp/
 csComp/js/
 csComp/node_modules/
 csServerComp/node_modules/
+csServerComp/Classes/**/*.d.ts
+csServerComp/Classes/**/*.js
 csServerComp/ServerComponents/**/*.d.ts
 csServerComp/ServerComponents/**/*.js
 csDataGatherer/node_modules/
@@ -48,3 +50,4 @@ test/csComp/spec/**/*.spec.js
 csDataGatherer/public/data/
 test/csComp/spec/directives/**/*.spec.js
 OfflineSearch
+example/public/data/projects/DynamicExample/

.travis.yml

@@ -1,4 +1,4 @@
-sudo: false
+sudo: required
 language: node_js
 node_js:
   - "0.12"

README.md

@@ -41,6 +41,14 @@ Just copy the example folder to a public folder and open the public\index.html f
 * Code review
 * Other guidelines
 
+#### Testing ####
+
+
+
+```
+karma start test/karma.conf.js
+```
+
 ### Who do I talk to? ###
 
 * Repo owner or admin

csComp/Scripts/typings/angular-translate/angular-translate.d.ts

@@ -5,16 +5,15 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
+declare module "angular-translate" {
+    var _: string;
+    export = _;
+}
+
 declare module angular.translate {
-
-    interface ITranslatePartialLoaderService {
-        addPart(name: string): ITranslatePartialLoaderService;
-        deletePart(name: string, removeData?: boolean): ITranslatePartialLoaderService;
-        isPartAvailable(name: string): boolean;
-    }
-
+
     interface ITranslationTable {
-        [key: string]: string | ITranslationTable;
+        [key: string]: any;
     }
 
     interface ILanguageKeyAlias {
@@ -26,12 +25,27 @@ declare module angular.translate {
         set(name: string, value: string): void;
     }
 
-    interface ISTaticFilesLoaderOptions {
+    interface IStaticFilesLoaderOptions {
         prefix: string;
         suffix: string;
         key?: string;
     }
 
+    interface IPartialLoader<T> {
+        addPart(name : string, priority? : number) : T;
+        deletePart(name : string) : T;
+        isPartAvailable(name : string) : boolean;
+    }
+
+    interface ITranslatePartialLoaderService extends IPartialLoader<ITranslatePartialLoaderService> {
+        getRegisteredParts() : Array<string>;
+        isPartLoaded(name : string, lang : string) : boolean;
+    }
+
+    interface ITranslatePartialLoaderProvider extends angular.IServiceProvider, IPartialLoader<ITranslatePartialLoaderProvider> {
+        setPart(lang : string, part : string, table : ITranslationTable) : ITranslatePartialLoaderProvider;
+    }
+
     interface ITranslateService {
         (translationId: string, interpolateParams?: any, interpolationId?: string): angular.IPromise<string>;
         (translationId: string[], interpolateParams?: any, interpolationId?: string): angular.IPromise<{ [key: string]: string }>;
@@ -78,8 +92,8 @@ declare module angular.translate {
         storageKey(): string;
         storageKey(key: string): void; // JeroMiya - the library should probably return ITranslateProvider but it doesn't here
         useUrlLoader(url: string): ITranslateProvider;
-        useStaticFilesLoader(options: ISTaticFilesLoaderOptions): ITranslateProvider;
-        useLoader(loaderFactory: string, options: any): ITranslateProvider;
+        useStaticFilesLoader(options: IStaticFilesLoaderOptions): ITranslateProvider;
+        useLoader(loaderFactory: string, options?: any): ITranslateProvider;
         useLocalStorage(): ITranslateProvider;
         useCookieStorage(): ITranslateProvider;
         useStorage(storageFactory: any): ITranslateProvider;