From 4fb7455e7018187d0bbe03ed6c6d364778121478 Mon Sep 17 00:00:00 2001 From: Athou Date: Tue, 16 Apr 2013 15:32:54 +0200 Subject: [PATCH] removed codemirror as we don't really need it and it's integration with angular is bugged --- .../commafeed/frontend/pages/HomePage.java | 4 --- .../codemirror/CodeMirrorCssReference.java | 30 ----------------- .../codemirror/CodeMirrorReference.java | 32 ------------------- src/main/webapp/js/controllers.js | 7 ++-- src/main/webapp/js/directives.js | 5 +-- src/main/webapp/js/main.js | 4 +-- src/main/webapp/templates/settings.html | 3 +- 7 files changed, 8 insertions(+), 77 deletions(-) delete mode 100644 src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorCssReference.java delete mode 100644 src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorReference.java diff --git a/src/main/java/com/commafeed/frontend/pages/HomePage.java b/src/main/java/com/commafeed/frontend/pages/HomePage.java index fe721cc0..ed5f28a7 100644 --- a/src/main/java/com/commafeed/frontend/pages/HomePage.java +++ b/src/main/java/com/commafeed/frontend/pages/HomePage.java @@ -19,8 +19,6 @@ import com.commafeed.frontend.references.angular.AngularSanitizeReference; import com.commafeed.frontend.references.angularui.AngularUIReference; import com.commafeed.frontend.references.angularuibootstrap.AngularUIBootstrapReference; import com.commafeed.frontend.references.angularuistate.AngularUIStateReference; -import com.commafeed.frontend.references.codemirror.CodeMirrorCssReference; -import com.commafeed.frontend.references.codemirror.CodeMirrorReference; import com.commafeed.frontend.references.fontawesome.FontAwesomeReference; import com.commafeed.frontend.references.mousetrap.MouseTrapReference; import com.commafeed.frontend.references.nggrid.NGGridReference; @@ -50,8 +48,6 @@ public class HomePage extends BasePage { SpinJSReference.renderHead(response); MouseTrapReference.renderHead(response); NGGridReference.renderHead(response); - CodeMirrorReference.renderHead(response); - CodeMirrorCssReference.renderHead(response); FontAwesomeReference.renderHead(response); response.render(JavaScriptHeaderItem.forUrl("js/main.js")); diff --git a/src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorCssReference.java b/src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorCssReference.java deleted file mode 100644 index 9357e8fd..00000000 --- a/src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorCssReference.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.commafeed.frontend.references.codemirror; - -import java.util.Arrays; - -import org.apache.wicket.markup.head.HeaderItem; -import org.apache.wicket.markup.head.IHeaderResponse; -import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import org.apache.wicket.request.Url; -import org.apache.wicket.request.resource.UrlResourceReference; - -public class CodeMirrorCssReference extends UrlResourceReference { - private static final long serialVersionUID = 1L; - - public static final CodeMirrorCssReference INSTANCE = new CodeMirrorCssReference(); - - private CodeMirrorCssReference() { - super( - Url.parse("https://cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/css.js")); - } - - @Override - public Iterable getDependencies() { - return Arrays.asList(JavaScriptHeaderItem - .forReference(CodeMirrorReference.INSTANCE)); - } - - public static void renderHead(final IHeaderResponse response) { - response.render(JavaScriptHeaderItem.forReference(INSTANCE)); - } -} \ No newline at end of file diff --git a/src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorReference.java b/src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorReference.java deleted file mode 100644 index 0a96427b..00000000 --- a/src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorReference.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.commafeed.frontend.references.codemirror; - -import java.util.Arrays; - -import org.apache.wicket.markup.head.CssHeaderItem; -import org.apache.wicket.markup.head.HeaderItem; -import org.apache.wicket.markup.head.IHeaderResponse; -import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import org.apache.wicket.request.Url; -import org.apache.wicket.request.resource.UrlResourceReference; - -public class CodeMirrorReference extends UrlResourceReference { - private static final long serialVersionUID = 1L; - - public static final CodeMirrorReference INSTANCE = new CodeMirrorReference(); - - private CodeMirrorReference() { - super( - Url.parse("https://cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/codemirror.min.js")); - } - - @Override - public Iterable getDependencies() { - return Arrays - .asList(CssHeaderItem.forReference(new UrlResourceReference( - Url.parse("https://cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/codemirror.min.css")))); - } - - public static void renderHead(final IHeaderResponse response) { - response.render(JavaScriptHeaderItem.forReference(INSTANCE)); - } -} \ No newline at end of file diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index f5bc41c3..1f4fefa7 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -545,10 +545,7 @@ module.controller('SettingsCtrl', function($scope, $location, SettingsService) { $scope.$watch('settingsService.settings', function(value) { $scope.settings = angular.copy(value); }); - $scope.codeMirrorConfig = { - mode : 'css', - lineNumbers : true - }; + $scope.cancel = function() { SettingsService.init(function() { $location.path('/'); @@ -557,7 +554,7 @@ module.controller('SettingsCtrl', function($scope, $location, SettingsService) { $scope.save = function() { SettingsService.settings = $scope.settings; SettingsService.save(function() { - + $location.path('/'); }); }; }); diff --git a/src/main/webapp/js/directives.js b/src/main/webapp/js/directives.js index 65c0cc70..4e034fda 100644 --- a/src/main/webapp/js/directives.js +++ b/src/main/webapp/js/directives.js @@ -86,8 +86,9 @@ module.directive('category', function($compile) { restrict : 'E', replace : true, templateUrl : 'directives/category.html', - controller : function($scope, $dialog, SubscriptionService, SettingsService) { - $scope.settingsService=SettingsService; + controller : function($scope, $dialog, SubscriptionService, + SettingsService) { + $scope.settingsService = SettingsService; $scope.unsubscribe = function(subscription) { var title = 'Unsubscribe'; var msg = 'Unsubscribe from ' + subscription.name + ' ?'; diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js index 13282263..09b579c0 100644 --- a/src/main/webapp/js/main.js +++ b/src/main/webapp/js/main.js @@ -48,13 +48,13 @@ app.config(function($routeProvider, $stateProvider, $urlRouterProvider) { templateUrl : 'templates/admin.settings.html', controller : 'ManageSettingsCtrl' }); - + $stateProvider.state('settings', { url : '/settings', templateUrl : 'templates/settings.html', controller : 'SettingsCtrl' }); - + $stateProvider.state('profile', { url : '/profile', templateUrl : 'templates/profile.html', diff --git a/src/main/webapp/templates/settings.html b/src/main/webapp/templates/settings.html index de9b74ad..58346653 100644 --- a/src/main/webapp/templates/settings.html +++ b/src/main/webapp/templates/settings.html @@ -29,8 +29,7 @@
-