From 6bc8713b7f74d792ff1e572279418f85e41fbaca Mon Sep 17 00:00:00 2001 From: perploug Date: Mon, 9 Sep 2013 15:26:22 +0100 Subject: [PATCH] Remove vaue->value typo in all files --- .../src/common/services/util.service.js | 2 +- .../markdowneditor.controller.js | 2 +- .../propertyeditors/rte/rte.controller.js | 4 +- .../test/config/karma.conf.js | 2 +- src/Umbraco.Web.UI.Client/test/config/unit.js | 66 ------------------- .../common/services/assets-service.spec.js | 2 +- .../markdowneditor.controller.js | 2 +- 7 files changed, 6 insertions(+), 74 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/test/config/unit.js diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js index a39741c72f..d2b8bfbde9 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js @@ -120,7 +120,7 @@ function imageHelper() { throw "The options objet does not contain the required parameters: imageModel"; } - var imagePropVal = this.getImagePropertyVaue(options); + var imagePropVal = this.getImagePropertyValue(options); if (imagePropVal !== "") { return this.getThumbnailFromPath(imagePropVal); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/MarkdownEditor/markdowneditor.controller.js b/src/Umbraco.Web.UI.Client/src/packages/MarkdownEditor/markdowneditor.controller.js index 5a7c70d79f..fa1cedf6c6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/MarkdownEditor/markdowneditor.controller.js +++ b/src/Umbraco.Web.UI.Client/src/packages/MarkdownEditor/markdowneditor.controller.js @@ -29,7 +29,7 @@ function ($scope, assetsService, dialogService, $log, imageHelper) { dialogService.mediaPicker({ callback: function (data) { $(data.selection).each(function (i, item) { - var imagePropVal = imageHelper.getImagePropertyVaue({ imageModel: item, scope: $scope }); + var imagePropVal = imageHelper.getImagePropertyValue({ imageModel: item, scope: $scope }); callback(imagePropVal); }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index 13f8db8649..b93e860a82 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -28,13 +28,12 @@ angular.module("umbraco") dialogService.mediaPicker({scope: $scope, callback: function(img){ if(img){ - var imagePropVal = imageHelper.getImagePropertyVaue({imageModel: img, scope: $scope}); + var imagePropVal = imageHelper.getImagePropertyValue({imageModel: img, scope: $scope}); var data = { src: (imagePropVal != null && imagePropVal != "") ? imagePropVal: "nothing.jpg", id: '__mcenew' }; - $log.log(data); editor.insertContent(editor.dom.createHTML('img', data)); @@ -48,7 +47,6 @@ angular.module("umbraco") editor.dom.setAttrib(imgElm, 'style', s); editor.dom.setAttrib(imgElm, 'rel', newSize.width + "," + newSize.height); editor.dom.setAttrib(imgElm, 'id', null); - }, 500); } diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js index 91db5e6fed..aca5648b07 100644 --- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js +++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js @@ -38,7 +38,7 @@ module.exports = function(karma) { 'src/views/**/*.controller.js', 'test/unit/**/*.spec.js', - {pattern: 'lib/umbraco/*.js', watched: true, served: true} + {pattern: 'lib/umbraco/namespacemanager.js', watched: true, served: true} ], // list of files to exclude diff --git a/src/Umbraco.Web.UI.Client/test/config/unit.js b/src/Umbraco.Web.UI.Client/test/config/unit.js deleted file mode 100644 index e6ad709dc3..0000000000 --- a/src/Umbraco.Web.UI.Client/test/config/unit.js +++ /dev/null @@ -1,66 +0,0 @@ -// base path, that will be used to resolve files and exclude -basePath = '../..'; - -// list of files / patterns to load in the browser -files = [ - JASMINE, - JASMINE_ADAPTER, - - 'lib/jquery/jquery-2.0.3.min.js', - 'lib/angular/angular.min.js', - 'lib/angular/angular-cookies.min.js', - 'test/lib/angular/angular-mocks.js', - 'lib/umbraco/Extensions.js', - 'src/app_dev.js', - 'src/common/directives/*.js', - 'src/common/filters/*.js', - 'src/common/services/*.js', - 'src/common/security/*.js', - 'src/common/mocks/**/*.js', - 'src/views/**/*.controller.js', - 'test/unit/**/*.spec.js' -]; - -plugins = [ - 'karma-jasmine', - 'karma-chrome-launcher', - 'karma-phantomjs-launcher' - ]; - -// use dots reporter, as travis terminal does not support escaping sequences -// possible values: 'dots' || 'progress' -reporters = 'progress'; - -// these are default values, just to show available options - -// web server port -port = 8089; - -// cli runner port -runnerPort = 9109; - -// enable / disable colors in the output (reporters and logs) -colors = true; - -// level of logging -// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG -logLevel = LOG_INFO; - -// enable / disable watching file and executing tests whenever any file changes -autoWatch = false; - -// polling interval in ms (ignored on OS that support inotify) -autoWatchInterval = 0; - -// Start these browsers, currently available: -// - Chrome -// - ChromeCanary -// - Firefox -// - Opera -// - Safari -// - PhantomJS -browsers = ['PhantomJS']; - -// Continuous Integration mode -// if true, it capture browsers, run tests and exit -singleRun = true; diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js index 452dfeaf26..76f526c75c 100644 --- a/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js +++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js @@ -10,7 +10,7 @@ describe('keyboard service tests', function () { describe('Loading js assets', function () { it('Loads a javascript file', function () { - assetsService.loadJs("lib/umbraco/NamespaceManager.js").then(function(){ + assetsService.loadJs("base/lib/umbraco/NamespaceManager.js").then(function(){ console.log("loaded"); }); diff --git a/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js b/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js index 5a7c70d79f..fa1cedf6c6 100644 --- a/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js +++ b/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js @@ -29,7 +29,7 @@ function ($scope, assetsService, dialogService, $log, imageHelper) { dialogService.mediaPicker({ callback: function (data) { $(data.selection).each(function (i, item) { - var imagePropVal = imageHelper.getImagePropertyVaue({ imageModel: item, scope: $scope }); + var imagePropVal = imageHelper.getImagePropertyValue({ imageModel: item, scope: $scope }); callback(imagePropVal); }); }