Merge branch 'master' into redesign-2015

webroot/rsrc/js/application/herald/HeraldRuleEditor.js

@@ -222,6 +222,7 @@ JX.install('HeraldRuleEditor', {
         case 'taskstatus':
         case 'legaldocuments':
         case 'applicationemail':
+        case 'space':
           var tokenizer = this._newTokenizer(type);
           input = tokenizer[0];
           get_fn = tokenizer[1];

webroot/rsrc/js/application/maniphest/behavior-batch-editor.js

@@ -24,12 +24,14 @@ JX.behavior('maniphest-batch-editor', function(config) {
         'add_comment': 'Comment',
         'assign': 'Assign',
         'add_ccs' : 'Add CCs',
-        'remove_ccs' : 'Remove CCs'
+        'remove_ccs' : 'Remove CCs',
+        'space': 'Shift to Space'
       });
 
     var proj_tokenizer = build_tokenizer(config.sources.project);
     var owner_tokenizer = build_tokenizer(config.sources.owner);
     var cc_tokenizer = build_tokenizer(config.sources.cc);
+    var space_tokenizer = build_tokenizer(config.sources.spaces);
 
     var priority_select = JX.Prefab.renderSelect(config.priorityMap);
     var status_select = JX.Prefab.renderSelect(config.statusMap);
@@ -60,6 +62,12 @@ JX.behavior('maniphest-batch-editor', function(config) {
             return JX.keys(owner_tokenizer.object.getTokens());
           };
           break;
+        case 'space':
+          JX.DOM.setContent(cell, space_tokenizer.template);
+          vfunc = function() {
+            return JX.keys(space_tokenizer.object.getTokens());
+          };
+          break;
         case 'add_comment':
           JX.DOM.setContent(cell, comment_input);
           vfunc = function() {

webroot/rsrc/js/application/policy/behavior-policy-control.js

@@ -101,7 +101,7 @@ JX.behavior('policy-control', function(config) {
    * Get the workflow URI to create or edit a policy with a given PHID.
    */
   var get_custom_uri = function(phid, capability) {
-    var uri = '/policy/edit/';
+    var uri = config.editURI;
     if (phid != config.customPlaceholder) {
       uri += phid + '/';
     }