Rename file step2.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34311d8d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34311d8d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34311d8d Branch: refs/heads/ignite-3262 Commit: 34311d8d089ff117fe1e78d157fbaee33047be94 Parents: 2c8e5f8 Author: Alexey Kuznetsov <[email protected]> Authored: Thu Jun 30 17:18:36 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Jun 30 17:18:36 2016 +0700 ---------------------------------------------------------------------- modules/web-console/src/main/js/app/app.js | 2 +- .../src/main/js/app/services/Confirm.service.js | 70 ++++++++++++++++++++ .../main/js/app/services/Confirm1.service.js | 70 -------------------- 3 files changed, 71 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34311d8d/modules/web-console/src/main/js/app/app.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/app.js b/modules/web-console/src/main/js/app/app.js index 48a03f6..ed83ac5 100644 --- a/modules/web-console/src/main/js/app/app.js +++ b/modules/web-console/src/main/js/app/app.js @@ -71,7 +71,7 @@ import igniteUiAceXml from './directives/ui-ace-xml/ui-ace-xml.directive'; // Services. import ChartColors from './services/ChartColors.service'; import Clone from './services/Clone.service.js'; -import Confirm from './services/Confirm1.service.js'; +import Confirm from './services/Confirm.service.js'; import ConfirmBatch from './services/ConfirmBatch.service.js'; import CopyToClipboard from './services/CopyToClipboard.service'; import Countries from './services/Countries.service'; http://git-wip-us.apache.org/repos/asf/ignite/blob/34311d8d/modules/web-console/src/main/js/app/services/Confirm.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/services/Confirm.service.js b/modules/web-console/src/main/js/app/services/Confirm.service.js new file mode 100644 index 0000000..c4e25a8 --- /dev/null +++ b/modules/web-console/src/main/js/app/services/Confirm.service.js @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ + +// Confirm popup service. +export default ['IgniteConfirm', ['$rootScope', '$q', '$modal', '$animate', ($root, $q, $modal, $animate) => { + const scope = $root.$new(); + + const modal = $modal({templateUrl: '/templates/confirm.html', scope, placement: 'center', show: false}); + + let deferred; + + const _hide = (animate) => { + $animate.enabled(modal.$element, animate); + + modal.hide(); + }; + + scope.confirmYes = () => { + _hide(scope.animate); + + deferred.resolve(true); + }; + + scope.confirmNo = () => { + _hide(scope.animate); + + deferred.resolve(false); + }; + + scope.confirmCancel = () => { + _hide(true); + + deferred.reject('cancelled'); + }; + + /** + * + * @param {String } content + * @param {Boolean} [yesNo] + * @param {Boolean} [animate] + * @returns {Promise} + */ + modal.confirm = (content, yesNo, animate) => { + scope.animate = !!animate; + scope.content = content || 'Confirm?'; + scope.yesNo = !!yesNo; + + deferred = $q.defer(); + + modal.$promise.then(modal.show); + + return deferred.promise; + }; + + return modal; +}]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/34311d8d/modules/web-console/src/main/js/app/services/Confirm1.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/services/Confirm1.service.js b/modules/web-console/src/main/js/app/services/Confirm1.service.js deleted file mode 100644 index c4e25a8..0000000 --- a/modules/web-console/src/main/js/app/services/Confirm1.service.js +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -// Confirm popup service. -export default ['IgniteConfirm', ['$rootScope', '$q', '$modal', '$animate', ($root, $q, $modal, $animate) => { - const scope = $root.$new(); - - const modal = $modal({templateUrl: '/templates/confirm.html', scope, placement: 'center', show: false}); - - let deferred; - - const _hide = (animate) => { - $animate.enabled(modal.$element, animate); - - modal.hide(); - }; - - scope.confirmYes = () => { - _hide(scope.animate); - - deferred.resolve(true); - }; - - scope.confirmNo = () => { - _hide(scope.animate); - - deferred.resolve(false); - }; - - scope.confirmCancel = () => { - _hide(true); - - deferred.reject('cancelled'); - }; - - /** - * - * @param {String } content - * @param {Boolean} [yesNo] - * @param {Boolean} [animate] - * @returns {Promise} - */ - modal.confirm = (content, yesNo, animate) => { - scope.animate = !!animate; - scope.content = content || 'Confirm?'; - scope.yesNo = !!yesNo; - - deferred = $q.defer(); - - modal.$promise.then(modal.show); - - return deferred.promise; - }; - - return modal; -}]];
