table sorting, server side completions, stability

facebookarchive · Aug 10, 2011 · 3b9be01 · 3b9be01
1 parent 2c55fea
commit 3b9be01
Show file tree

Hide file tree

Showing 106 changed files with 2,968 additions and 3,359 deletions.
diff --git a/ads/controller/app.js b/ads/controller/app.js
@@ -40,7 +40,7 @@ var dom   = require("../../uki-core/dom"),
     db     = require("../db"),
     models = require("../models"),
 
-    UserStorage = require("../lib/userStorage").UserStorage,
+    UserStorage = require("../../lib/userStorage").UserStorage,
 
     AccountResultWrapper =
         require("../lib/accountResultWrapper").AccountResultWrapper,
@@ -115,8 +115,6 @@ function init(uid) {
 }
 
 function dbInitCallback() {
-  require("./downloadCompletions")
-    .DownloadCompletions.download(initList);
   require("./downloadBCT")
     .DownloadBCT.download(initList);
 }
@@ -140,16 +138,12 @@ function initList(preserveVisState) {
       models.Contract.prepare(function(contracts) {
         models.Topline.prepare(function(toplines) {
           models.Campaign.prepare(function(campaigns) {
-            // same as ConnectedObject
-            models.Completion.prepare(['locales'],
-            function() {
 
-              _buildOrRestoreCampaignList(
-                preserveVisState,
-                accounts, campaigns,
-                contracts, toplines);
+            _buildOrRestoreCampaignList(
+              preserveVisState,
+              accounts, campaigns,
+              contracts, toplines);
 
-            }, true);
           }, true);
         }, true);
       }, true);

diff --git a/ads/controller/bulkImport.js b/ads/controller/bulkImport.js
@@ -31,13 +31,13 @@ var utils = require("../../uki-core/utils"),
     BulkImportDialog = require("../view/bulkImportDialog").BulkImportDialog,
     LogDialog = require("../view/logDialog").LogDialog,
 
-    imageReader  = require("../lib/imageReader"),
+    imageReader  = require("../../lib/imageReader"),
     models       = require("../models"),
 
     ParserJob = require("../job/tabSeparatedParser").Parser,
     CampImporterJob = require("../job/campImporter").Importer,
 
-    DeferredList = require("../lib/deferredList").DeferredList,
+    DeferredList = require("../../lib/deferredList").DeferredList,
     App          = require("./app").App,
     Mutator      = require("./mutator").Mutator;
 
@@ -182,6 +182,8 @@ function initErrors() {
 }
 
 BulkImport.importInto = function(account, text, imageLookup) {
+  require("../lib/completions").dialog = BulkImport.progressDialog();
+
   var parser = new ParserJob(account, text, imageLookup);
 
   parser.oncomplete(function() {

diff --git a/ads/controller/delete.js b/ads/controller/delete.js
@@ -27,7 +27,7 @@ var view   = require("../../uki-core/view"),
     env    = require("../../uki-core/env"),
     evt    = require("../../uki-core/event"),
 
-    DeferredList = require("../lib/deferredList").DeferredList;
+    DeferredList = require("../../lib/deferredList").DeferredList;