From 8f94390363b92a80cd4bc1005cb3e02228ab07a8 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 8 May 2015 11:12:20 +1000 Subject: [PATCH] Moving a bunch of index related services from general admin module into indexUtils --- .../admin/index_utils/index_utils.js.coffee | 2 +- .../services/data_submitter.js.coffee | 2 +- .../services/pending_changes.js.coffee | 2 +- .../{ => index_utils}/services/resources.js.coffee | 2 +- .../index_utils/services/switch_class.js.coffee | 10 ++++++++++ .../admin/services/switch_class.js.coffee | 13 ------------- 6 files changed, 14 insertions(+), 17 deletions(-) rename app/assets/javascripts/admin/{ => index_utils}/services/data_submitter.js.coffee (73%) rename app/assets/javascripts/admin/{ => index_utils}/services/pending_changes.js.coffee (91%) rename app/assets/javascripts/admin/{ => index_utils}/services/resources.js.coffee (89%) create mode 100644 app/assets/javascripts/admin/index_utils/services/switch_class.js.coffee delete mode 100644 app/assets/javascripts/admin/services/switch_class.js.coffee diff --git a/app/assets/javascripts/admin/index_utils/index_utils.js.coffee b/app/assets/javascripts/admin/index_utils/index_utils.js.coffee index eef7b0aa5f..46fc050742 100644 --- a/app/assets/javascripts/admin/index_utils/index_utils.js.coffee +++ b/app/assets/javascripts/admin/index_utils/index_utils.js.coffee @@ -1 +1 @@ -angular.module("admin.indexUtils", []) \ No newline at end of file +angular.module("admin.indexUtils", ['ngResource']) \ No newline at end of file diff --git a/app/assets/javascripts/admin/services/data_submitter.js.coffee b/app/assets/javascripts/admin/index_utils/services/data_submitter.js.coffee similarity index 73% rename from app/assets/javascripts/admin/services/data_submitter.js.coffee rename to app/assets/javascripts/admin/index_utils/services/data_submitter.js.coffee index a9b917aae2..934ae4a07e 100644 --- a/app/assets/javascripts/admin/services/data_submitter.js.coffee +++ b/app/assets/javascripts/admin/index_utils/services/data_submitter.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").factory "dataSubmitter", ($http, $q, resources) -> +angular.module("admin.indexUtils").factory "dataSubmitter", ($http, $q, resources) -> return (change) -> deferred = $q.defer() resources.update(change).$promise.then (data) -> diff --git a/app/assets/javascripts/admin/services/pending_changes.js.coffee b/app/assets/javascripts/admin/index_utils/services/pending_changes.js.coffee similarity index 91% rename from app/assets/javascripts/admin/services/pending_changes.js.coffee rename to app/assets/javascripts/admin/index_utils/services/pending_changes.js.coffee index 64a463eb62..f39a1b3ca6 100644 --- a/app/assets/javascripts/admin/services/pending_changes.js.coffee +++ b/app/assets/javascripts/admin/index_utils/services/pending_changes.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").factory "pendingChanges", (dataSubmitter) -> +angular.module("admin.indexUtils").factory "pendingChanges", (dataSubmitter) -> pendingChanges: {} add: (id, attr, change) -> diff --git a/app/assets/javascripts/admin/services/resources.js.coffee b/app/assets/javascripts/admin/index_utils/services/resources.js.coffee similarity index 89% rename from app/assets/javascripts/admin/services/resources.js.coffee rename to app/assets/javascripts/admin/index_utils/services/resources.js.coffee index 337f1c2601..c14744701b 100644 --- a/app/assets/javascripts/admin/services/resources.js.coffee +++ b/app/assets/javascripts/admin/index_utils/services/resources.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").factory "resources", ($resource) -> +angular.module("admin.indexUtils").factory "resources", ($resource) -> LineItem = $resource '/api/orders/:order_number/line_items/:line_item_id.json', { order_number: '@order_cycle_id', line_item_id: '@line_item_id'}, 'update': { method: 'PUT' } diff --git a/app/assets/javascripts/admin/index_utils/services/switch_class.js.coffee b/app/assets/javascripts/admin/index_utils/services/switch_class.js.coffee new file mode 100644 index 0000000000..c2a3419e2c --- /dev/null +++ b/app/assets/javascripts/admin/index_utils/services/switch_class.js.coffee @@ -0,0 +1,10 @@ +angular.module("admin.indexUtils").factory "switchClass", ($timeout) -> + return (element,classToAdd,removeClasses,timeout) -> + $timeout.cancel element.timeout if element.timeout + element.removeClass className for className in removeClasses + element.addClass classToAdd + intRegex = /^\d+$/ + if timeout && intRegex.test(timeout) + element.timeout = $timeout(-> + element.removeClass classToAdd + , timeout, true) diff --git a/app/assets/javascripts/admin/services/switch_class.js.coffee b/app/assets/javascripts/admin/services/switch_class.js.coffee deleted file mode 100644 index e39c52d1f6..0000000000 --- a/app/assets/javascripts/admin/services/switch_class.js.coffee +++ /dev/null @@ -1,13 +0,0 @@ -angular.module("ofn.admin").factory "switchClass", [ - "$timeout" - ($timeout) -> - return (element,classToAdd,removeClasses,timeout) -> - $timeout.cancel element.timeout if element.timeout - element.removeClass className for className in removeClasses - element.addClass classToAdd - intRegex = /^\d+$/ - if timeout && intRegex.test(timeout) - element.timeout = $timeout(-> - element.removeClass classToAdd - , timeout, true) -] \ No newline at end of file