Merge branch 'development' into dev-denys-440

# Conflicts:
#	.travis.yml
#	demo-shell-ng2/app/app.component.html
#	demo-shell-ng2/app/app.component.ts
#	demo-shell-ng2/package.json
#	demo-shell-ng2/systemjs.config.js

demo-shell-ng2/app/components/files/files.component.html

@@ -120,31 +120,56 @@
 </div>
 
 
+<p style="width:250px;margin: 20px;">
+    <label for="switch-multiple-file" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+        <input type="checkbox" id="switch-multiple-file" class="mdl-switch__input" (change)="toggleMultipleFileUpload()" >
+        <span class="mdl-switch__label">Multiple File Upload</span>
+    </label>
+</p>
 
-<h5>Single file upload</h5>
-<alfresco-upload-button data-automation-id="single-file-upload"
-                        [uploaddirectory]="currentPath"
-                        [currentFolderPath]="currentPath"
-                        (onSuccess)="documentList.reload()">
-</alfresco-upload-button>
 
-<h5>Folder upload</h5>
-<alfresco-upload-button data-automation-id="folder-upload"
-                        [uploaddirectory]="currentPath"
-                        [currentFolderPath]="currentPath"
-                        [uploadFolders]="true"
-                        (onSuccess)="documentList.reload()">
-</alfresco-upload-button>
+<p style="width:250px;margin: 20px;">
+    <label for="switch-folder-upload" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+        <input type="checkbox" id="switch-folder-upload" class="mdl-switch__input" (change)="toggleFolder()">
+        <span class="mdl-switch__label">Folder Upload</span>
+    </label>
+</p>
 
-<h5>Multiple file upload</h5>
-<input type="text" data-automation-id="accepted-files-type" [(ngModel)]="acceptedFilesType">
-<alfresco-upload-button data-automation-id="multiple-file-upload"
-                        [uploaddirectory]="currentPath"
-                        [currentFolderPath]="currentPath"
-                        acceptedFilesType="{{acceptedFilesType}}"
-                        [multipleFiles]="true"
-                        (onSuccess)="documentList.reload()">
-</alfresco-upload-button>
+<p style="width:250px;margin: 20px;">
+    <label for="switch-accepted-file-type" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+        <input type="checkbox" id="switch-accepted-file-type" class="mdl-switch__input" (change)="toggleAcceptedFilesType()">
+        <span class="mdl-switch__label">Filter extension</span>
+    </label>
+</p>
+
+<h5>Upload</h5>
+<br>
+<div *ngIf="acceptedFilesTypeShow">
+    <span class="mdl-input__label">Extension accepted</span>
+    <input type="text" data-automation-id="accepted-files-type" [(ngModel)]="acceptedFilesType">
+    <br/>
+</div>
+<div *ngIf="!acceptedFilesTypeShow">
+    <alfresco-upload-button data-automation-id="multiple-file-upload"
+                            [uploaddirectory]="currentPath"
+                            [currentFolderPath]="currentPath"
+                            [multipleFiles]="multipleFileUpload"
+                            [uploadFolders]="folderUpload"
+                            (onSuccess)="documentList.reload()">
+        <div class="mdl-spinner mdl-js-spinner is-active"></div>
+    </alfresco-upload-button>
+</div>
+<div *ngIf="acceptedFilesTypeShow">
+    <alfresco-upload-button data-automation-id="multiple-file-upload"
+                            [uploaddirectory]="currentPath"
+                            [currentFolderPath]="currentPath"
+                            acceptedFilesType="{{acceptedFilesType}}"
+                            [multipleFiles]="multipleFileUpload"
+                            [uploadFolders]="folderUpload"
+                            (onSuccess)="documentList.reload()">
+        <div class="mdl-spinner mdl-js-spinner is-active"></div>
+    </alfresco-upload-button>
+</div>
 
 <alfresco-viewer [(showViewer)]="fileShowed"
                  [urlFile]="urlFile"
@@ -153,4 +178,5 @@
                  [overlayMode]="true">
     <div class="mdl-spinner mdl-js-spinner is-active"></div>
 </alfresco-viewer>
+
 <file-uploading-dialog #fileDialog></file-uploading-dialog>

demo-shell-ng2/app/components/files/files.component.ts

@@ -56,12 +56,14 @@ export class FilesComponent {
     fileName: string;
     mimeType: string;
     fileShowed: boolean = false;
+    multipleFileUpload: boolean = false;
+    folderUpload: boolean = false;
+    acceptedFilesTypeShow: boolean = false;
 
     acceptedFilesType: string = '.jpg,.pdf,.js';
 
-    constructor(
-        private contentService: AlfrescoContentService,
-        documentActions: DocumentActionsService) {
+    constructor(private contentService: AlfrescoContentService,
+                documentActions: DocumentActionsService) {
         documentActions.setHandler('my-handler', this.myDocumentActionHandler.bind(this));
     }
 
@@ -93,4 +95,20 @@ export class FilesComponent {
             this.currentPath = event.path;
         }
     }
+
+    toggleMultipleFileUpload() {
+        this.multipleFileUpload = !this.multipleFileUpload;
+        return this.multipleFileUpload;
+    }
+
+    toggleFolder() {
+        this.multipleFileUpload = false;
+        this.folderUpload = !this.folderUpload;
+        return this.folderUpload;
+    }
+
+    toggleAcceptedFilesType() {
+        this.acceptedFilesTypeShow = !this.acceptedFilesTypeShow;
+        return this.acceptedFilesTypeShow;
+    }
 }

demo-shell-ng2/app/components/webscript/webscript.component.ts

@@ -0,0 +1,62 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component } from '@angular/core';
+import {
+    CONTEXT_MENU_DIRECTIVES
+} from 'ng2-alfresco-core';
+
+import { WEBSCRIPTCOMPONENT } from 'ng2-alfresco-webscript';
+
+@Component({
+    selector: 'alfresco-webscript-demo',
+    template: `
+                <label for="token"><b>Insert a scriptPath</b></label><br>
+                <input id="token" type="text" size="48"  [(ngModel)]="scriptPath"><br>
+                <label for="token"><b>Insert a contextRoot</b></label><br>
+                <input id="token" type="text" size="48"  [(ngModel)]="contextRoot"><br>
+                <label for="token"><b>Insert a servicePath</b></label><br>
+                <input id="token" type="text" size="48"  [(ngModel)]="servicePath"><br>
+            <alfresco-webscript-get [scriptPath]="scriptPath"
+                           [scriptArgs]="scriptArgs"
+                           [contextRoot]="contextRoot"
+                           [servicePath]="servicePath"
+                           [contentType]="'HTML'"
+                           (onSuccess)= "logData($event)"></alfresco-webscript-get>
+    `,
+    directives: [WEBSCRIPTCOMPONENT, CONTEXT_MENU_DIRECTIVES]
+})
+export class WebscriptComponent {
+
+    currentPath: string = '/';
+
+    authenticated: boolean;
+
+    host: string = 'http://127.0.0.1:8080';
+
+    scriptPath: string = 'sample/folder/Company%20Home';
+
+    contextRoot: string = 'alfresco';
+
+    servicePath: string = 'service';
+
+    scriptArgs: string = '';
+
+    logData(data) {
+        console.log(data);
+    }
+}