Switched to angular-cloudinary dependency due to upstream issue with …

…official clouinary''s dependency on jquery ui Applied fixes from StyleCI
spira · Dec 6, 2015 · 75cf8b5 · 75cf8b5
1 parent ca2957a
commit 75cf8b5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/api/tests/integration/EntityTest.php b/api/tests/integration/EntityTest.php
@@ -212,7 +212,7 @@ public function testGetAllPaginatedComplexSearch()
 
         $this->assertResponseStatus(404);
     }
-    
+
     public function testGetAllPaginatedComplexSearchMatchAll()
     {
         $results = $this->getFactory(TestEntity::class)->count(5)->make();
@@ -227,8 +227,7 @@ public function testGetAllPaginatedComplexSearchMatchAll()
             ->andReturn(5)
             ->shouldReceive('getIterator')
             ->once()
-            ->andReturn($results->getIterator())
-        ;
+            ->andReturn($results->getIterator());
 
         $mockModel = Mockery::mock(TestEntity::class);
         $mockModel

diff --git a/app/bower.json b/app/bower.json
@@ -30,7 +30,6 @@
     "angular-ui-router": "~0.2.15",
     "angular-ui-utils": "~0.2.3",
     "angular-ui-validate": "~1.1.1",
-    "cloudinary_ng": "~0.1.4",
     "font-awesome": "~4.5.0",
     "highlightjs": "~8.5.0",
     "jquery": "~2.1.3",
@@ -45,7 +44,8 @@
     "chance": "~0.7.6",
     "angular-material-data-table": "~0.8.14",
     "to-markdown": "~1.3.0",
-    "simplemde": "~1.8.1"
+    "simplemde": "~1.8.1",
+    "angular-cloudinary": "~1.2.2"
   },
   "devDependencies": {
     "angular-mocks": "~1.4",
@@ -54,14 +54,10 @@
   },
   "resolutions": {
     "lodash": "~3.10",
-    "angular": "1.4.7"
+    "angular": "1.4.7",
+    "ng-file-upload": "~7.0.15"
   },
   "overrides": {
-    "cloudinary_js": {
-      "dependencies": {
-        "jquery": ">=1.6"
-      }
-    },
     "simplemde": {
       "main": [
         "dist/simplemde.min.css",

diff --git a/app/src/app/admin/navigation/navigation.less b/app/src/app/admin/navigation/navigation.less
@@ -1,9 +1,5 @@
 @import (reference) "../../../styles/theme/reference/admin-variables";
 
-footer {
-    display: none; //@todo decide whether a footer is wanted
-}
-
 md-sidenav#admin-sidenav {
 
 

diff --git a/app/src/config/vendorModules.ts b/app/src/config/vendorModules.ts
@@ -4,10 +4,15 @@ namespace config.vendorModules {
 
     class CloudinaryConfig {
 
-        constructor() {
 
-            //for some dumb reason cloudinary angular is dependent on jquery. Hopefully they support native angular at some point
-            (<any>$).cloudinary.config().cloud_name = 'spira';
+        static $inject = ['cloudinaryProvider'];
+
+        constructor(cloudinaryProvider:any) {
+
+            cloudinaryProvider.config({
+                upload_endpoint: 'https://api.cloudinary.com/v1_1/', // default
+                cloud_name: 'spira', // required
+            });
         }
     }
 
@@ -100,7 +105,8 @@ namespace config.vendorModules {
         'infinite-scroll', //infinite scrolling - https://github.com/sroze/ngInfiniteScroll
         'ui.validate', // Field validator - https://github.com/angular-ui/ui-validate
         'ngFileUpload', // File uploader - https://github.com/danialfarid/ng-file-upload
-        'cloudinary', //directives for displaying cloudinary images (official) - https://github.com/cloudinary/cloudinary_angular
+        //'cloudinary', //directives for displaying cloudinary images (official) - https://github.com/cloudinary/cloudinary_angular
+        'angular-cloudinary', //https://github.com/thenikso/angular-cloudinary
         'hc.marked', //markdown parser - https://github.com/Hypercubed/angular-marked
         'angular-carousel', //content carousel - https://github.com/revolunet/angular-carousel
         'md.data.table', //https://github.com/daniel-nagy/md-data-table

diff --git a/app/src/styles/theme/admin-theme.less b/app/src/styles/theme/admin-theme.less
@@ -21,4 +21,8 @@
         width: 400px;
     }
 
+    footer {
+        display: none; //@todo decide whether a footer is wanted
+    }
+
 }