* @package NetCommons\Likes\View\Helper
*/
class LikeHelper extends AppHelper {
@@ -31,13 +33,14 @@ class LikeHelper extends AppHelper {
*
* @var array
*/
- public $helpers = array(
+ public $helpers = [
'Html',
'Form',
+ 'NetCommons.CDNCache',
'NetCommons.NetCommonsForm',
'NetCommons.NetCommonsHtml',
'NetCommons.Token',
- );
+ ];
/**
* Before render callback. beforeRender is called before the view file is rendered.
@@ -138,33 +141,43 @@ public function setting($likeFieldName, $unlikeFieldName, $attributes = array())
* #### Sample code
* ##### template file(ctp file)
* ```
- * Like->display($bbsSetting, $bbsArticle); ?>
+ * Like->display('BbsArticle', $bbsSetting, $bbsArticle); ?>
* ```
*
+ * @param array $model String of model name
* @param array $setting Array of use like setting data.
* @param array $content Array of content data with like count.
* @param array $attributes Array of attributes and HTML arguments.
* @return string HTML tags
*/
- public function display($setting, $content, $attributes = array()) {
+ public function display($model, $setting, $content, $attributes = array()) {
$output = '';
+ $condsStr = $this->_View->request->params['plugin'] . '-' .
+ Current::read('Block.key') . '-' . ($content[$model]['key'] ?? '');
+
+ $like = $this->__getInitialLike($content);
+
//いいね
if (isset($setting['use_like']) && $setting['use_like']) {
- $element = ' ';
- $element .= (int)Hash::get($content, 'Like.like_count');
+ $element = '';
+ $element .= ' ';
+ $element .= '' . $like['like_count'] . '';
+ $element .= '';
$output .= $this->Html->div(
- array('like-icon', 'text-muted'), $element, $attributes
- );
+ array('like-icon', 'text-muted'), $element, $attributes
+ );
}
//わるいね
if (isset($setting['use_unlike']) && $setting['use_unlike']) {
- $element = ' ';
- $element .= (int)Hash::get($content, 'Like.unlike_count');
+ $element = '';
+ $element .= ' ';
+ $element .= '' . $like['unlike_count'] . '';
+ $element .= '';
$output .= $this->Html->div(
- array('like-icon', 'text-muted'), $element, $attributes
- );
+ array('like-icon', 'text-muted'), $element, $attributes
+ );
}
return $output;
@@ -193,13 +206,12 @@ public function display($setting, $content, $attributes = array()) {
public function buttons($model, $setting, $content, $attributes = array()) {
$output = '';
- if (! Hash::get($setting, 'use_like') && ! Hash::get($setting, 'use_like')) {
+ if (! Hash::get($setting, 'use_like') && ! Hash::get($setting, 'use_unlike')) {
return $output;
}
- if (isset($content['LikesUser']['id']) ||
- $content[$model]['status'] !== WorkflowComponent::STATUS_PUBLISHED) {
- return $this->display($setting, $content, $attributes);
+ if ($content[$model]['status'] !== WorkflowComponent::STATUS_PUBLISHED) {
+ return $this->display($model, $setting, $content, $attributes);
}
if (! isset($content['Like']['id'])) {
@@ -217,51 +229,53 @@ public function buttons($model, $setting, $content, $attributes = array()) {
);
}
- $data = array(
- 'Frame' => array('id' => Current::read('Frame.id')),
- 'Like' => array(
+ $data = [
+ 'Frame' => ['id' => Current::read('Frame.id')],
+ 'Like' => [
'plugin_key' => Hash::get($content, 'Like.plugin_key'),
'block_key' => Hash::get($content, 'Like.block_key'),
'content_key' => Hash::get($content, 'Like.content_key'),
- ),
- 'LikesUser' => array(
+ ],
+ 'LikesUser' => [
'like_id' => Hash::get($content, 'LikesUser.like_id'),
'user_id' => Hash::get($content, 'LikesUser.user_id'),
'is_liked' => Hash::get($content, 'LikesUser.is_liked'),
- ),
- );
- $options = array(
- 'likeCount' => (int)Hash::get($content, 'Like.like_count'),
- 'unlikeCount' => (int)Hash::get($content, 'Like.unlike_count'),
- 'disabled' => false
- );
+ ],
+ ];
$tokenFields = Hash::flatten($data);
$hiddenFields = $tokenFields;
unset($hiddenFields['LikesUser.is_liked']);
$hiddenFields = array_keys($hiddenFields);
- $cunnentData = $this->_View->request->data;
+ $currentData = $this->_View->request->data;
$this->_View->request->data = $data;
- $tokens = $this->Token->getToken('Like', '/likes/likes/like.json', $tokenFields, $hiddenFields);
- $data += $tokens;
+ $token = $this->Token->getToken(
+ 'LikeSave', '/likes/likes/save.json', $tokenFields, $hiddenFields
+ );
+ $data += $token;
+
+ $this->_View->request->data = $currentData;
+
+ $like = $content['Like'];
+ $condsStr = $like['plugin_key'] . '-' . $like['block_key'] . '-' . $like['content_key'];
- $this->_View->request->data = $cunnentData;
+ $like = $this->__getInitialLike($content);
$output .= '';
+ 'ng-init="initialize(' . h(json_encode($data)) . ')">';
//いいね
if (Hash::get($setting, 'use_like')) {
- $output .= $this->Html->div(array('like-icon'),
- $this->_View->element('Likes.like_button', ['isLiked' => Like::IS_LIKE]), $attributes);
+ $output .= $this->Html->div(array('like-icon'), $this->_View->element('Likes.like_button',
+ ['condsStr' => $condsStr, 'like' => $like, 'isLiked' => Like::IS_LIKE]), $attributes);
}
//わるいね
if (Hash::get($setting, 'use_unlike')) {
- $output .= $this->Html->div(array('like-icon'),
- $this->_View->element('Likes.like_button', ['isLiked' => Like::IS_UNLIKE]), $attributes);
+ $output .= $this->Html->div(array('like-icon'), $this->_View->element('Likes.like_button',
+ ['condsStr' => $condsStr, 'like' => $like, 'isLiked' => Like::IS_UNLIKE]), $attributes);
}
$output .= '
';
@@ -269,4 +283,25 @@ public function buttons($model, $setting, $content, $attributes = array()) {
return $output;
}
+/**
+ * Ajaxの実行前に表示すべきいいね情報を返します。
+ *
+ * @param array $content Array of content data with like count.
+ * @return array
+ */
+ private function __getInitialLike($content) {
+ if ($this->CDNCache->isCacheable()) {
+ return [
+ 'like_count' => '-',
+ 'unlike_count' => '-',
+ 'disabled' => true,
+ ];
+ }
+ $like = $content['Like'];
+ return [
+ 'like_count' => Hash::get($like, 'like_count', 0),
+ 'unlike_count' => Hash::get($like, 'unlike_count', 0),
+ 'disabled' => $content['LikesUser']['is_liked'],
+ ];
+ }
}
diff --git a/webroot/js/likes.js b/webroot/js/likes.js
index bd2708c..f896df6 100644
--- a/webroot/js/likes.js
+++ b/webroot/js/likes.js
@@ -1,6 +1,7 @@
/**
* @fileoverview Likes Javascript
* @author nakajimashouhei@gmail.com (Shohei Nakajima)
+ * @author exkazuu@willbooster.com (Kazunori Sakamoto)
*/
@@ -11,39 +12,38 @@
* @param {function('$http', '$q')} Controller
*/
NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
- return function(post) {
-
+ return function(data) {
var deferred = $q.defer();
var promise = deferred.promise;
$http.get(NC3_URL + '/net_commons/net_commons/csrfToken.json')
.then(function(response) {
var token = response.data;
- post._Token.key = token.data._Token.key;
+ data._Token.key = token.data._Token.key;
- //POSTリクエスト
+ // POSTリクエスト
$http.post(
- NC3_URL + '/likes/likes/like.json',
- $.param({_method: 'POST', data: post}),
- {cache: false,
- headers:
- {'Content-Type': 'application/x-www-form-urlencoded'}
+ NC3_URL + '/likes/likes/save.json',
+ $.param({_method: 'POST', data: data}),
+ {
+ cache: false,
+ headers: {'Content-Type': 'application/x-www-form-urlencoded'}
}
).then(
- function(response) {
- //success condition
+ function(response) {
+ // success condition
var data = response.data;
deferred.resolve(data);
},
- function(response) {
- //error condition
+ function(response) {
+ // error condition
var data = response.data;
var status = response.status;
deferred.reject(data, status);
});
},
function(response) {
- //Token error condition
+ // Token error condition
var data = response.data;
var status = response.status;
deferred.reject(data, status);
@@ -79,16 +79,6 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesSave', function($scope, Likes
*/
$scope.data = null;
- /**
- * Options parameters
- * - disabled
- * - likeCounts
- * - unlikeCounts
- *
- * @type {object}
- */
- $scope.options = null;
-
/**
* initialize
* - disabled
@@ -97,10 +87,8 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesSave', function($scope, Likes
*
* @return {void}
*/
- $scope.initialize = function(data, options) {
+ $scope.initialize = function(data) {
$scope.data = data;
- $scope.options = options;
- $scope.options.disabled = false;
};
/**
@@ -108,27 +96,28 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesSave', function($scope, Likes
*
* @return {void}
*/
- $scope.save = function(isLiked) {
- $scope.data['LikesUser']['is_liked'] = isLiked;
- if ($scope.options.disabled) {
- return;
- }
- $scope.options.disabled = true;
- $scope.sending = true;
+ $scope.save = function(isLiked, condsStr) {
+ var queryPrefix = '.' + condsStr;
+ var aDisplay = $(queryPrefix + ' > a').css('display');
+ var spanDisplay = $(queryPrefix + ' > span').css('display');
+
+ $(queryPrefix + ' > a').css('display', 'none');
+ $(queryPrefix + ' > span').css('display', '');
+ $scope.data.LikesUser.is_liked = isLiked;
LikesSave($scope.data)
- .success(function(data) {
- $scope.sending = false;
- //success condition
+ .success(function() {
+ var $counts;
if (isLiked) {
- $scope.options['likeCount'] = $scope.options['likeCount'] + 1;
+ $counts = $(queryPrefix + ' .like-count');
} else {
- $scope.options['unlikeCount'] = $scope.options['unlikeCount'] + 1;
+ $counts = $(queryPrefix + ' .unlike-count');
}
+ $counts.each(function() { $(this).text(Number($(this).text()) + 1); });
})
- .error(function(data, status) {
- //error condition
- $scope.sending = false;
+ .error(function() {
+ $(queryPrefix + ' > a').css('display', aDisplay);
+ $(queryPrefix + ' > span').css('display', spanDisplay);
});
};
}]);