fix contextmenu on linux system

phuongdev89 · Nov 9, 2016 · 31f5213 · 31f5213
1 parent 59a8214
commit 31f5213
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -29,8 +29,7 @@
 		"bower-asset/fontawesome" : "^4.6",
 		"bower-asset/patternfly-bootstrap-treeview" : "~2.1",
 		"bower-asset/jquery.lazyload" : "~1.9",
-		"bower-asset/fancybox" : "~2.1",
-		"bower-asset/jquery-contextmenu" : "~2.3"
+		"bower-asset/fancybox" : "~2.1"
 	},
 	"conflict" : {
 		"skeeks/yii2-assets-auto-compress" : "1.2.*"
@@ -41,13 +40,6 @@
 		}
 	},
 	"extra" : {
-		"bootstrap" : "navatech\\roxymce\\Bootstrap",
-		"asset-repositories" : [
-			{
-				"name": "bower-asset/jquery-contextmenu",
-				"type": "bower-vcs",
-				"url": "https://github.com/swisnl/jQuery-contextMenu.git"
-			}
-		]
+		"bootstrap" : "navatech\\roxymce\\Bootstrap"
 	}
 }
diff --git a/src/assets/ContextMenuAsset.php b/src/assets/ContextMenuAsset.php
diff --git a/src/assets/RoxyMceAsset.php b/src/assets/RoxyMceAsset.php
@@ -38,9 +38,11 @@ public function init() {
 		];
 		$this->css        = [
 			YII_ENV_DEV ? 'css/roxy.css' : 'css/roxy.min.css',
+			'css/jquery.contextMenu.min.css',
 		];
 		$this->js         = [
 			YII_ENV_DEV ? 'js/roxy.js' : 'js/roxy.min.js',
+			'jquery.contextMenu.min.js',
 		];
 		Yii::$app->view->registerJs('var msg_somethings_went_wrong = "' . Yii::t('roxy', 'Somethings went wrong') . '",
 msg_empty_directory = "' . Yii::t('roxy', 'Empty directory') . '",

diff --git a/src/web/css/jquery.contextMenu.min.css b/src/web/css/jquery.contextMenu.min.css
diff --git a/src/web/js/jquery.contextMenu.min.js b/src/web/js/jquery.contextMenu.min.js