From 44226a22e9022bb82563f9527a46d40b13697c49 Mon Sep 17 00:00:00 2001 From: Per Ploug Date: Thu, 8 Oct 2015 15:47:51 +0200 Subject: [PATCH] Removes legacy files --- .../canvasdesigner.loader.js.BACKUP.20976.js | 25 ------------ .../js/canvasdesigner.loader.js.BASE.20976.js | 19 --------- .../canvasdesigner.loader.js.LOCAL.20976.js | 20 ---------- .../canvasdesigner.loader.js.REMOTE.20976.js | 19 --------- .../js/sample.propertyeditor.controller.js | 40 ------------------- .../js/sampletwo.propertyeditor.controller.js | 36 ----------------- 6 files changed, 159 deletions(-) delete mode 100644 src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.BACKUP.20976.js delete mode 100644 src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.BASE.20976.js delete mode 100644 src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.LOCAL.20976.js delete mode 100644 src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.REMOTE.20976.js delete mode 100644 src/Umbraco.Web.UI/umbraco/js/sample.propertyeditor.controller.js delete mode 100644 src/Umbraco.Web.UI/umbraco/js/sampletwo.propertyeditor.controller.js diff --git a/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.BACKUP.20976.js b/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.BACKUP.20976.js deleted file mode 100644 index aa59420f90..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.BACKUP.20976.js +++ /dev/null @@ -1,25 +0,0 @@ - -LazyLoad.js([ - '/Umbraco/lib/jquery/jquery.min.js', - '/Umbraco/lib/jquery-ui/jquery-ui.min.js', - '/Umbraco/lib/angular/1.1.5/angular.min.js', - '/Umbraco/lib/underscore/underscore-min.js', - '/Umbraco/js/app.js', - '/Umbraco/js/umbraco.resources.js', - '/Umbraco/js/umbraco.services.js', - '/Umbraco/js/umbraco.security.js', - '/Umbraco/ServerVariables', - '/Umbraco/lib/spectrum/spectrum.js', -<<<<<<< HEAD - '/Umbraco/js/canvasdesigner.panel.js', -======= - 'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js', - '/umbraco/js/canvasdesigner.panel.js', ->>>>>>> 7.3.0 -], function () { - jQuery(document).ready(function () { - angular.bootstrap(document, ['Umbraco.canvasdesigner']); - }); -}); - -LazyLoad.js(['https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js']); diff --git a/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.BASE.20976.js b/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.BASE.20976.js deleted file mode 100644 index 3e4dfe7f54..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.BASE.20976.js +++ /dev/null @@ -1,19 +0,0 @@ -LazyLoad.js([ - '/Umbraco/lib/jquery/jquery.min.js', - '/Umbraco/lib/jquery-ui/jquery-ui.min.js', - '/Umbraco/lib/angular/1.1.5/angular.min.js', - '/Umbraco/lib/underscore/underscore-min.js', - '/Umbraco/js/app.js', - '/Umbraco/js/umbraco.resources.js', - '/Umbraco/js/umbraco.services.js', - '/Umbraco/js/umbraco.security.js', - '/Umbraco/ServerVariables', - '/Umbraco/lib/spectrum/spectrum.js', - 'http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js', - '/umbraco/js/canvasdesigner.panel.js', -], function () { - jQuery(document).ready(function () { - angular.bootstrap(document, ['Umbraco.canvasdesigner']); - }); -} -); diff --git a/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.LOCAL.20976.js b/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.LOCAL.20976.js deleted file mode 100644 index 7dce9f0ee0..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.LOCAL.20976.js +++ /dev/null @@ -1,20 +0,0 @@ - -LazyLoad.js([ - '/Umbraco/lib/jquery/jquery.min.js', - '/Umbraco/lib/jquery-ui/jquery-ui.min.js', - '/Umbraco/lib/angular/1.1.5/angular.min.js', - '/Umbraco/lib/underscore/underscore-min.js', - '/Umbraco/js/app.js', - '/Umbraco/js/umbraco.resources.js', - '/Umbraco/js/umbraco.services.js', - '/Umbraco/js/umbraco.security.js', - '/Umbraco/ServerVariables', - '/Umbraco/lib/spectrum/spectrum.js', - '/Umbraco/js/canvasdesigner.panel.js', -], function () { - jQuery(document).ready(function () { - angular.bootstrap(document, ['Umbraco.canvasdesigner']); - }); -}); - -LazyLoad.js(['https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js']); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.REMOTE.20976.js b/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.REMOTE.20976.js deleted file mode 100644 index db9a5fb23c..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/js/canvasdesigner.loader.js.REMOTE.20976.js +++ /dev/null @@ -1,19 +0,0 @@ -LazyLoad.js([ - '/Umbraco/lib/jquery/jquery.min.js', - '/Umbraco/lib/jquery-ui/jquery-ui.min.js', - '/Umbraco/lib/angular/1.1.5/angular.min.js', - '/Umbraco/lib/underscore/underscore-min.js', - '/Umbraco/js/app.js', - '/Umbraco/js/umbraco.resources.js', - '/Umbraco/js/umbraco.services.js', - '/Umbraco/js/umbraco.security.js', - '/Umbraco/ServerVariables', - '/Umbraco/lib/spectrum/spectrum.js', - 'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js', - '/umbraco/js/canvasdesigner.panel.js', -], function () { - jQuery(document).ready(function () { - angular.bootstrap(document, ['Umbraco.canvasdesigner']); - }); -} -); diff --git a/src/Umbraco.Web.UI/umbraco/js/sample.propertyeditor.controller.js b/src/Umbraco.Web.UI/umbraco/js/sample.propertyeditor.controller.js deleted file mode 100644 index f1a6bfd7f5..0000000000 --- a/src/Umbraco.Web.UI/umbraco/js/sample.propertyeditor.controller.js +++ /dev/null @@ -1,40 +0,0 @@ -//Sample file to simplify setting up a property editor -//without any serverside processing - -//defines that the below JS code needs angular to be loaded -//this is strictly a require.js convention -//we are working in making that simpler (and been advised to ditch requirejs) - -define(['app','angular'], function (app, angular) { - - //Next we get the umbraco module, so we can register a controller on it - angular.module('umbraco') - .controller("Sample.PropertyEditorController", function($scope, $log, dialog){ - - //we could then output the scope data to the log: - $log.log($scope.model); - - //or we could set the model value - $scope.model.value = "Test data"; - - //we could have a function: - //which appends something to the model data - $scope.doStuff = function(input){ - $scope.model.value = input + " Appended value"; - }; - - //we could use one of the internal services to wire up a dialog - $scope.openDialog = function(){ - var d = dialog.mediaPicker({scope: $scope, callback: myCallBack}); - }; - - function myCallBack(data){ - $.each(data.selection, function(i, img){ - $log.log(img); - $scope.model.value += img.url; - }); - } - }); - - return angular; -}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/js/sampletwo.propertyeditor.controller.js b/src/Umbraco.Web.UI/umbraco/js/sampletwo.propertyeditor.controller.js deleted file mode 100644 index 787b722370..0000000000 --- a/src/Umbraco.Web.UI/umbraco/js/sampletwo.propertyeditor.controller.js +++ /dev/null @@ -1,36 +0,0 @@ -//Sample file to simplify setting up a property editor -//without any serverside processing - -//defines that the below JS code needs angular to be loaded -//this is strictly a require.js convention -//we are working in making that simpler (and been advised to ditch requirejs) - -define(['app','angular'], function (app, angular) { - - //Next we get the umbraco module, so we can register a controller on it - angular.module('umbraco') - .controller("SampleTwo.PropertyEditorController", function($scope, $log, dialog){ - - //we could then output the scope data to the log: - $log.log($scope.model); - - //we could have a function: - //which appends something to the model data - $scope.doStuff = function(input){ - $scope.model.value = input + " Appended value"; - }; - - //we could use one of the internal services to wire up a dialog - $scope.openDialog = function(){ - var d = dialog.mediaPicker({scope: $scope, callback: myCallBack}); - }; - - function myCallBack(data){ - $.each(data.selection, function(i, img){ - $scope.model.value += img.url; - }); - } - }); - - return angular; -}); \ No newline at end of file