= журнал - перемещение файлов

! не грузится jquery в журнале
ClienDDev · May 15, 2016 · 0557532 · 0557532
1 parent 84eea89
commit 0557532
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/js/fixtures/school/journal/extension.js → ...ixtures/school/journal/index/extension.js b/js/fixtures/school/journal/extension.js → ...ixtures/school/journal/index/extension.js
@@ -4,7 +4,7 @@
  */
 
 $(document).ready(function(){
-    cliend_include_js(chrome.extension.getURL("js/libs/jquery.min.js"));
-    cliend_include_js(chrome.extension.getURL("js/fixtures/school/journal/page.js"));
+    cliend_include_js(chrome.extension.getURL("libs/jquery/dist/jquery.min.js"));
+    cliend_include_js(chrome.extension.getURL("js/fixtures/school/journal/index/page.js"));
     cliend_include_style(chrome.extension.getURL("styles/fixtures/school/journal.css"));
 });
diff --git a/js/fixtures/school/journal/page.js → js/fixtures/school/journal/index/page.js b/js/fixtures/school/journal/page.js → js/fixtures/school/journal/index/page.js
diff --git a/js/fixtures/school/journal/lesson-edit.js b/js/fixtures/school/journal/lesson-edit.js
@@ -0,0 +1,3 @@
+/*
+* @Author: Artur Atnagulov (ClienDDev team)
+*/
diff --git a/manifest.json b/manifest.json
@@ -135,7 +135,7 @@
 			"js": [
 				"/libs/jquery/dist/jquery.min.js",
 				"/js/common/base.js",
-				"/js/fixtures/school/journal/extension.js"
+				"/js/fixtures/school/journal/index/extension.js"
 			],
 			"run_at": "document_end"
 		},
@@ -161,7 +161,7 @@
 		"js/common/get_vk_post_id.js",
 
 		"js/fixtures/admin/page/news/edit/page.js",
-		"js/fixtures/school/journal/page.js",
+		"js/fixtures/school/journal/index/page.js",
 		"js/fixtures/upload_crop/show/page.js",
 
 		"js/vk/post_share.js",