more cleanup

conestack · Nov 4, 2024 · d1dee00 · d1dee00
1 parent 7490d15
commit d1dee00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/yafowil/widget/ace/__init__.py b/src/yafowil/widget/ace/__init__.py
@@ -27,6 +27,7 @@
 resources.add(wr.ScriptResource(
     name='yafowil-ace-js',
     directory=os.path.join(resources_dir, 'default'),
+    path='yafowil-ace/default',
     depends=[
         'jquery-js',
         'ace-js'
@@ -37,6 +38,7 @@
 resources.add(wr.StyleResource(
     name='yafowil-ace-css',
     directory=os.path.join(resources_dir, 'default'),
+    path='yafowil-ace/default',
     resource='widget.min.css'
 ))
 
@@ -78,6 +80,7 @@
 bootstrap5_resources.add(wr.ScriptResource(
     name='yafowil-ace-js',
     directory=os.path.join(resources_dir, 'bootstrap5'),
+    path='yafowil-ace/bootstrap5',
     depends=[
         'jquery-js',
         'ace-js'
@@ -88,6 +91,7 @@
 bootstrap5_resources.add(wr.StyleResource(
     name='yafowil-ace-css',
     directory=os.path.join(resources_dir, 'bootstrap5'),
+    path='yafowil-ace/bootstrap5',
     resource='widget.min.css'
 ))
 

diff --git a/src/yafowil/widget/ace/tests/test_widget.py b/src/yafowil/widget/ace/tests/test_widget.py
@@ -103,14 +103,14 @@ def test_resources(self):
         self.assertTrue(os.path.exists(scripts[0].file_path))
 
         self.assertTrue(scripts[1].directory.endswith(np('/ace/resources/default')))
-        self.assertEqual(scripts[1].path, 'yafowil-ace')
+        self.assertEqual(scripts[1].path, 'yafowil-ace/default')
         self.assertEqual(scripts[1].file_name, 'widget.min.js')
         self.assertTrue(os.path.exists(scripts[1].file_path))
 
         styles = resources.styles
         self.assertEqual(len(styles), 1)
 
         self.assertTrue(styles[0].directory.endswith(np('/ace/resources/default')))
-        self.assertEqual(styles[0].path, 'yafowil-ace')
+        self.assertEqual(styles[0].path, 'yafowil-ace/default')
         self.assertEqual(styles[0].file_name, 'widget.min.css')
         self.assertTrue(os.path.exists(styles[0].file_path))