Small fixes around grunt and scopes.

yacaovsnc · Oct 21, 2015 · ddb906b · ddb906b
1 parent bf120ef
commit ddb906b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -79,10 +79,8 @@ module.exports = function (grunt) {
           dest: '<%= dirs.output.packages %>' + name
         },
         {
-          expand: true,
-          flatten: true,
-          src: 'lib/*.js',
-          dest: '<%= dirs.output.web %>' + name + '/sdk/scripts'
+          src: 'lib/VSS.SDK.js',
+          dest: '<%= dirs.output.web %>' + name + '/sdk/scripts/VSS.SDK.js'
         }
       ]
     };

diff --git a/ui/compareToForm.html b/ui/compareToForm.html
@@ -14,9 +14,9 @@
     VSS.require([
         "VSS/Service",
         "VSS/Controls",
-        "VSS/Controls/Common",
+        "VSS/Controls/Combos",
         "TFS/VersionControl/GitRestClient"], 
-        function (Service, Controls, CommonControls, GitWebApi) {
+        function (Service, Controls, Combos, GitWebApi) {
 
         var compareToForm = (function() {
 
@@ -36,7 +36,7 @@
                 });
             }
 
-            branchSelector = Controls.create(CommonControls.Combo, $("#main-container"), {
+            branchSelector = Controls.create(Combos.Combo, $("#main-container"), {
                 mode: "drop",
                 allowEdit: false,
                 source: [],

diff --git a/ui/vss-extension.json b/ui/vss-extension.json
@@ -15,6 +15,7 @@
     "categories": [
         "Sync and integration"
     ],
+    "scopes": ["vso.work", "vso.work_write"],
     "contributions": [
         {
             "id": "sample-ui-group",

diff --git a/ui/workItemService.html b/ui/workItemService.html
@@ -38,15 +38,15 @@
             "TFS/WorkItemTracking/Services",
             "TFS/WorkItemTracking/RestClient",
             "VSS/Controls",
-            "VSS/Controls/Common"], function(_WorkItemServices, _WorkItemRestClient, _Controls, _ControlsCommon) {
+            "VSS/Controls/Combos"], function(_WorkItemServices, _WorkItemRestClient, _Controls, _Combos) {
 
             VSS.notifyLoadSucceeded();
 
             var workItemTypesCombo;
 
             var witClient = _WorkItemRestClient.getClient();
             witClient.getWorkItemTypes(VSS.getWebContext().project.name).then(function(workItemTypes) {
-                workItemTypesCombo = _Controls.create(_ControlsCommon.Combo, $(".work-item-types"), {
+                workItemTypesCombo = _Controls.create(_Combos.Combo, $(".work-item-types"), {
                     source: $.map(workItemTypes, function(wiType) { return wiType.name })
                 });
                 if (workItemTypes.length > 0) {