From 78e7617c6741a6862513fcac98e403f5a5e61d1b Mon Sep 17 00:00:00 2001
From: dewitast <dewitast20@gmail.com>
Date: Tue, 6 Feb 2018 17:27:54 +0700
Subject: [PATCH] fix bug on css and js
---
.../Magento/Messaging/Block/Messaging.php | 25 +++++++++++++++++--
.../frontend/layout/messaging_index_index.xml | 8 +++---
.../view/frontend/requirejs-config.js | 7 ++++++
.../view/frontend/templates/messaging.phtml | 10 +++++++-
4 files changed, 43 insertions(+), 7 deletions(-)
create mode 100644 app/code/Magento/Messaging/view/frontend/requirejs-config.js
diff --git a/app/code/Magento/Messaging/Block/Messaging.php b/app/code/Magento/Messaging/Block/Messaging.php
index 11ede2e1284..4b9cb210ece 100644
--- a/app/code/Magento/Messaging/Block/Messaging.php
+++ b/app/code/Magento/Messaging/Block/Messaging.php
@@ -3,8 +3,29 @@ namespace Magento\Messaging\Block;
class Messaging extends \Magento\Framework\View\Element\Template
{
- public function getText()
- {
+ /**
+ * @var \Magento\Framework\App\ObjectManager
+ */
+ public $om;
+
+ /**
+ * @var \Magento\Customer\Model\Session
+ */
+ public $session;
+
+ public function getText() {
return 'Hello world!';
}
+
+ public function getId() {
+ if ($om === null || $session === null) {
+ $om = \Magento\Framework\App\ObjectManager::getInstance();
+ $session = $om->get('\Magento\Customer\Model\Session');
+ }
+ if ($session->isLoggedIn()) {
+ return $session->getCustomer()->getId();
+ } else {
+ return -1;
+ }
+ }
}
\ No newline at end of file
diff --git a/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml b/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
index eb9f38ba14e..d61a1e1a573 100644
--- a/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
+++ b/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
@@ -1,10 +1,10 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" layout="1column">
<head>
<title>Messaging</title>
- <css src="Messaging::css/chat.css" />
- <script src="Messaging::js/chat.js" />
- <script src="Messaging::js/angular.js" />
- <script src="Messaging::js/jquery.js" />
+ <css src="Magento_Messaging::css/chat.css" />
+ <script src="Magento_Messaging::js/chat.js" />
+ <script src="Magento_Messaging::js/angular.js" />
+ <script src="Magento_Messaging::js/jquery.js" />
</head>
<body ng-app="chatlistbox" ng-controller="controller">
<referenceContainer name="content">
diff --git a/app/code/Magento/Messaging/view/frontend/requirejs-config.js b/app/code/Magento/Messaging/view/frontend/requirejs-config.js
new file mode 100644
index 00000000000..03b382c9f5e
--- /dev/null
+++ b/app/code/Magento/Messaging/view/frontend/requirejs-config.js
@@ -0,0 +1,7 @@
+var config = {
+ map: {
+ '*': {
+ messaging: 'Magento_Messaging/js/test',
+ }
+ }
+};
\ No newline at end of file
diff --git a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
index 21ed1f6fb4b..6094746e846 100644
--- a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
@@ -17,4 +17,12 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+require(['jquery'],function($){
+ $(document).ready(function() {
+ alert('hai');
+ });
+});
+</script>
\ No newline at end of file
--
GitLab