dev_cs_new
commit
ed19add0af
@ -0,0 +1,2 @@
|
|||||||
|
// Place all the behaviors and hooks related to the matching controller here.
|
||||||
|
// All this logic will automatically be available in application.js.
|
||||||
@ -1,7 +1,7 @@
|
|||||||
module PaginateHelper
|
module PaginateHelper
|
||||||
def paginate(objs, **opts)
|
def paginate(objs, **opts)
|
||||||
page = params[:page].to_i <= 0 ? 1 : params[:page].to_i
|
page = params[:page].to_i <= 0 ? 1 : params[:page].to_i
|
||||||
per_page = params[:per_page].to_i > 0 ? params[:per_page].to_i : opts[:per_page] || 20
|
per_page = params[:per_page].to_i > 0 && params[:per_page].to_i < 50 ? params[:per_page].to_i : opts[:per_page] || 20
|
||||||
|
|
||||||
Kaminari.paginate_array(objs).page(page).per(per_page)
|
Kaminari.paginate_array(objs).page(page).per(per_page)
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,10 +1,2 @@
|
|||||||
class ProjectsController < ApplicationController
|
class ProjectsController < ApplicationController
|
||||||
def search
|
|
||||||
query_params = { keyword: params[:keyword], category: 'manage' }
|
|
||||||
projects = Users::ProjectService.new(current_user, query_params).call
|
|
||||||
|
|
||||||
params[:limit] = params[:per_page].to_i.zero? ? 20 : params[:per_page].to_i
|
|
||||||
@count = projects.count
|
|
||||||
@projects = paginate projects
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
class Users::PrivateMessageDetailsController < Users::BaseController
|
||||||
|
before_action :private_user_resources!
|
||||||
|
|
||||||
|
after_action :update_message_status, only: [:show]
|
||||||
|
|
||||||
|
def show
|
||||||
|
messages = observed_user.private_messages.without_deleted.where(target: target_user)
|
||||||
|
|
||||||
|
@count = messages.count
|
||||||
|
@messages = messages.order(send_time: :asc).includes(sender: :user_extension)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def target_user
|
||||||
|
@_target_user ||= User.find(params[:target_id])
|
||||||
|
end
|
||||||
|
|
||||||
|
# 置为已读
|
||||||
|
def update_message_status
|
||||||
|
observed_user.private_messages.only_unread.where(target: target_user).update_all(status: 1)
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
class Users::PrivateMessagesController < Users::BaseController
|
||||||
|
before_action :private_user_resources!
|
||||||
|
after_action :update_onclick_time!, only: [:index]
|
||||||
|
|
||||||
|
def index
|
||||||
|
@count = observed_user.private_messages.without_deleted.group(:target_id).count.count
|
||||||
|
|
||||||
|
subquery = observed_user.private_messages.without_deleted.order(send_time: :desc).to_sql
|
||||||
|
query = "SELECT subquery.*, COUNT(*) message_count FROM (#{subquery}) subquery "\
|
||||||
|
"GROUP BY subquery.target_id ORDER BY subquery.send_time desc LIMIT #{limit_value} OFFSET #{offset_value}"
|
||||||
|
@messages = PrivateMessage.select('*').from("(#{query}) AS query").includes(target: :user_extension)
|
||||||
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
receiver = User.find_by(id: params[:target_id])
|
||||||
|
return render_error('用户未找到') if receiver.blank?
|
||||||
|
|
||||||
|
@message = PrivateMessages::CreateService.call(observed_user, receiver, create_params)
|
||||||
|
rescue PrivateMessages::CreateService::Error => ex
|
||||||
|
render_error(ex.message)
|
||||||
|
end
|
||||||
|
|
||||||
|
def destroy
|
||||||
|
message = observed_user.private_messages.without_deleted.find(params[:id])
|
||||||
|
message.destroy!
|
||||||
|
|
||||||
|
render_ok
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def update_onclick_time!
|
||||||
|
current_user.onclick_time.touch(:onclick_time)
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_params
|
||||||
|
params.permit(:content)
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
class Users::RecentContactsController < Users::BaseController
|
||||||
|
before_action :private_user_resources!
|
||||||
|
|
||||||
|
def index
|
||||||
|
contacts = observed_user.recent_contacts.distinct
|
||||||
|
@contacts = contacts.order('private_messages.created_at DESC').limit(10).includes(:user_extension)
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
class Users::UnreadMessageInfosController < Users::BaseController
|
||||||
|
before_action :private_user_resources!
|
||||||
|
|
||||||
|
def show
|
||||||
|
click_time = observed_user.click_time
|
||||||
|
|
||||||
|
unread_tiding_count = observed_user.tidings.where('created_at > ?', click_time).count
|
||||||
|
unread_message_count = observed_user.private_messages.only_unread.group(:target_id).count.count
|
||||||
|
|
||||||
|
render_ok(unread_tiding_count: unread_tiding_count, unread_message_count: unread_message_count)
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
class UsersForPrivateMessagesController < ApplicationController
|
||||||
|
before_action :require_login, :check_auth
|
||||||
|
|
||||||
|
def index
|
||||||
|
users = User.active.where.not(id: current_user.id)
|
||||||
|
|
||||||
|
keyword = params[:keyword].to_s.strip
|
||||||
|
if keyword.blank?
|
||||||
|
@users = []
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
users = users.where('LOWER(concat(lastname, firstname, nickname)) LIKE ?', "%#{keyword}%")
|
||||||
|
|
||||||
|
@users = users.limit(10).includes(:user_extension)
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
module PrivateMessageDecorator
|
||||||
|
extend ApplicationDecorator
|
||||||
|
|
||||||
|
display_time_method :send_time
|
||||||
|
|
||||||
|
def unread?
|
||||||
|
status.zero?
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -1,2 +1,6 @@
|
|||||||
module MemosHelper
|
module MemosHelper
|
||||||
|
|
||||||
|
def forum_list
|
||||||
|
[{id: 5, name: "技术分享"}, {id: 3, name: "操作指南"}]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -0,0 +1,2 @@
|
|||||||
|
class Forum < ApplicationRecord
|
||||||
|
end
|
||||||
@ -1,3 +1,9 @@
|
|||||||
class PrivateMessage < ApplicationRecord
|
class PrivateMessage < ApplicationRecord
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
|
belongs_to :target, class_name: "User"
|
||||||
|
belongs_to :sender, class_name: "User"
|
||||||
|
belongs_to :receiver, class_name: "User"
|
||||||
|
|
||||||
|
scope :without_deleted, -> { where.not(status: 2) }
|
||||||
|
scope :only_unread, -> { where(status: 0) }
|
||||||
end
|
end
|
||||||
|
|||||||
@ -0,0 +1,35 @@
|
|||||||
|
class PrivateMessages::CreateService < ApplicationService
|
||||||
|
Error = Class.new(StandardError)
|
||||||
|
|
||||||
|
attr_reader :sender, :receiver, :params
|
||||||
|
|
||||||
|
def initialize(sender, receiver, params)
|
||||||
|
@sender = sender
|
||||||
|
@receiver = receiver
|
||||||
|
@params = params
|
||||||
|
end
|
||||||
|
|
||||||
|
def call
|
||||||
|
validate!
|
||||||
|
|
||||||
|
same_attr = { sender: sender, receiver: receiver, content: content, send_time: Time.now }
|
||||||
|
|
||||||
|
message = nil
|
||||||
|
ActiveRecord::Base.transaction do
|
||||||
|
message = sender.private_messages.create!(same_attr.merge(target: receiver, status: 1))
|
||||||
|
receiver.private_messages.create!(same_attr.merge(target: sender, status: 0))
|
||||||
|
end
|
||||||
|
message
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def content
|
||||||
|
@_content ||= params[:content].to_s.strip
|
||||||
|
end
|
||||||
|
|
||||||
|
def validate!
|
||||||
|
raise Error, '内容不能为空' if content.blank?
|
||||||
|
raise Error, '内容太长' if content.size > 255
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
json.memo_list @memos
|
||||||
|
# do |memo|
|
||||||
|
# json.(memo, :id, :updated_at, :reward)
|
||||||
|
# json.subject message_content(memo.content)
|
||||||
|
# json.praise_count memo.praises_count
|
||||||
|
# json.replies_count memo.child_discuss_count
|
||||||
|
# json.shixun_tag memo.dis.tag_repertoires.map(&:name)
|
||||||
|
# json.username memo.user.full_name
|
||||||
|
# json.login memo.user.login
|
||||||
|
# json.image_url url_to_avatar(memo.user)
|
||||||
|
# json.tpm_url "/shixuns/#{memo.dis.identifier}/shixun_discuss"
|
||||||
|
# end
|
||||||
|
|
||||||
|
json.memo_count @memo_count
|
||||||
|
|
||||||
|
json.hot_memos do
|
||||||
|
json.array! @hot_memos do |hm|
|
||||||
|
json.(hm, :id, :subject, :language, :forum_id)
|
||||||
|
json.replies_count hm.all_replies_count
|
||||||
|
# json.praise_count hm.praise_tread.praise_count
|
||||||
|
json.tag hm.tag_repertoires.map(&:name)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
json.hot_tags @hot_tags
|
||||||
|
|
||||||
|
json.recommend_shixuns @recommend_shixuns
|
||||||
@ -1 +1,2 @@
|
|||||||
|
json.status 0
|
||||||
json.code @code
|
json.code @code
|
||||||
@ -1,8 +1,14 @@
|
|||||||
json.(memo, :id, :subject, :is_md, :content, :sticky, :reward, :viewed_count)
|
json.memo do
|
||||||
|
json.id memo.id
|
||||||
|
json.subject memo.subject
|
||||||
|
json.is_md memo.is_md
|
||||||
|
json.content memo.content
|
||||||
|
json.sticky memo.sticky
|
||||||
|
json.reward memo.reward
|
||||||
|
json.viewed_count memo.viewed_count
|
||||||
json.tag memo.tag_repertoires.map(&:name)
|
json.tag memo.tag_repertoires.map(&:name)
|
||||||
json.time memo.created_at
|
json.time memo.created_at
|
||||||
json.replies_count memo.all_replies_count
|
json.replies_count memo.all_replies_count
|
||||||
json.attachments_list []
|
json.user_praise memo.praise_treads.user_liker(@user.try(:id)) ? true : false
|
||||||
json.user_praise memo.praise_tread.user_liker(@user.try(:id)) ? true : false
|
json.memo_praise_count memo.praise_treads.liker.count
|
||||||
json.memo_praise_count = memo.praise_tread.liker.count
|
end
|
||||||
|
|||||||
@ -0,0 +1,7 @@
|
|||||||
|
json.(@memo, :subject, :content, :forum_id)
|
||||||
|
json.memo_tags @memo_tags
|
||||||
|
json.attachments @attachments do |attachment|
|
||||||
|
json.partial! "attachments/attachment_simple", locals: {attachment: attachment}
|
||||||
|
end
|
||||||
|
json.tag_list @tag_list
|
||||||
|
json.forums forum_list
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
json.memo_replies do
|
||||||
|
json.array! @memos do |memo|
|
||||||
|
json.partial! "memos/replies_list", memo: memo
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
json.memos_count @memos_count
|
||||||
@ -1,3 +1,2 @@
|
|||||||
json.tag_list @tag_list
|
json.tag_list @tag_list
|
||||||
json.csrf_token @csrf_token
|
json.forums forum_list
|
||||||
|
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
json.count @count
|
||||||
|
json.messages do
|
||||||
|
json.array! @messages.each do |message|
|
||||||
|
json.extract! message, :id, :user_id, :receiver_id, :sender_id, :content
|
||||||
|
|
||||||
|
json.send_time message.display_send_time
|
||||||
|
json.sender do
|
||||||
|
json.partial! 'users/user_simple', user: message.sender
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
json.status 0
|
||||||
|
json.message 'success'
|
||||||
|
json.private_message do
|
||||||
|
json.extract! @message, :id, :user_id, :receiver_id, :sender_id, :content
|
||||||
|
|
||||||
|
json.send_time @message.display_send_time
|
||||||
|
json.sender do
|
||||||
|
json.partial! 'users/user_simple', user: @message.sender
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
json.count @count
|
||||||
|
json.private_messages do
|
||||||
|
json.array! @messages.each do |message|
|
||||||
|
json.extract! message, :id, :content, :message_count
|
||||||
|
|
||||||
|
json.unread message.unread?
|
||||||
|
json.send_time message.display_send_time
|
||||||
|
|
||||||
|
json.target do
|
||||||
|
json.partial! 'users/user_simple', user: message.target
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
json.users @contacts, partial: 'users/user_simple', as: :user
|
||||||
|
json.count @contacts.size
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
json.users @users, partial: 'users/user_simple', as: :user
|
||||||
|
json.count @users.size
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
class AddIndexToUser < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
# add_index :users, :login, unique: true
|
||||||
|
# add_index :users, :mail, unique: true
|
||||||
|
# add_index :users, :phone, unique: true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
After Width: | Height: | Size: 53 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 58 KiB |
@ -0,0 +1,490 @@
|
|||||||
|
/*
|
||||||
|
* jQuery File Download Plugin v1.4.5
|
||||||
|
*
|
||||||
|
* http://www.johnculviner.com
|
||||||
|
*
|
||||||
|
* Copyright (c) 2013 - John Culviner
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license:
|
||||||
|
* http://www.opensource.org/licenses/mit-license.php
|
||||||
|
*
|
||||||
|
* !!!!NOTE!!!!
|
||||||
|
* You must also write a cookie in conjunction with using this plugin in the server's response headers containing the file download:
|
||||||
|
* Set-Cookie: fileDownload=true; path=/"
|
||||||
|
* !!!!NOTE!!!!
|
||||||
|
*/
|
||||||
|
|
||||||
|
(function($, window){
|
||||||
|
// i'll just put them here to get evaluated on script load
|
||||||
|
var htmlSpecialCharsRegEx = /[<>&\r\n"']/gm;
|
||||||
|
var htmlSpecialCharsPlaceHolders = {
|
||||||
|
'<': 'lt;',
|
||||||
|
'>': 'gt;',
|
||||||
|
'&': 'amp;',
|
||||||
|
'\r': "#13;",
|
||||||
|
'\n': "#10;",
|
||||||
|
'"': 'quot;',
|
||||||
|
"'": '#39;' /*single quotes just to be safe, IE8 doesn't support ', so use ' instead */
|
||||||
|
};
|
||||||
|
|
||||||
|
$.extend({
|
||||||
|
//
|
||||||
|
//$.fileDownload('/path/to/url/', options)
|
||||||
|
// see directly below for possible 'options'
|
||||||
|
fileDownload: function (fileUrl, options) {
|
||||||
|
|
||||||
|
//provide some reasonable defaults to any unspecified options below
|
||||||
|
var settings = $.extend({
|
||||||
|
|
||||||
|
//
|
||||||
|
//Requires jQuery UI: provide a message to display to the user when the file download is being prepared before the browser's dialog appears
|
||||||
|
//
|
||||||
|
preparingMessageHtml: null,
|
||||||
|
|
||||||
|
//
|
||||||
|
//Requires jQuery UI: provide a message to display to the user when a file download fails
|
||||||
|
//
|
||||||
|
failMessageHtml: null,
|
||||||
|
|
||||||
|
//
|
||||||
|
//the stock android browser straight up doesn't support file downloads initiated by a non GET: http://code.google.com/p/android/issues/detail?id=1780
|
||||||
|
//specify a message here to display if a user tries with an android browser
|
||||||
|
//if jQuery UI is installed this will be a dialog, otherwise it will be an alert
|
||||||
|
//Set to null to disable the message and attempt to download anyway
|
||||||
|
//
|
||||||
|
androidPostUnsupportedMessageHtml: "Unfortunately your Android browser doesn't support this type of file download. Please try again with a different browser.",
|
||||||
|
|
||||||
|
//
|
||||||
|
//Requires jQuery UI: options to pass into jQuery UI Dialog
|
||||||
|
//
|
||||||
|
dialogOptions: { modal: true },
|
||||||
|
|
||||||
|
//
|
||||||
|
//a function to call while the dowload is being prepared before the browser's dialog appears
|
||||||
|
//Args:
|
||||||
|
// url - the original url attempted
|
||||||
|
//
|
||||||
|
prepareCallback: function (url) { },
|
||||||
|
|
||||||
|
//
|
||||||
|
//a function to call after a file download successfully completed
|
||||||
|
//Args:
|
||||||
|
// url - the original url attempted
|
||||||
|
//
|
||||||
|
successCallback: function (url) { },
|
||||||
|
|
||||||
|
//
|
||||||
|
//a function to call after a file download request was canceled
|
||||||
|
//Args:
|
||||||
|
// url - the original url attempted
|
||||||
|
//
|
||||||
|
abortCallback: function (url) { },
|
||||||
|
|
||||||
|
//
|
||||||
|
//a function to call after a file download failed
|
||||||
|
//Args:
|
||||||
|
// responseHtml - the html that came back in response to the file download. this won't necessarily come back depending on the browser.
|
||||||
|
// in less than IE9 a cross domain error occurs because 500+ errors cause a cross domain issue due to IE subbing out the
|
||||||
|
// server's error message with a "helpful" IE built in message
|
||||||
|
// url - the original url attempted
|
||||||
|
// error - original error cautch from exception
|
||||||
|
//
|
||||||
|
failCallback: function (responseHtml, url, error) { },
|
||||||
|
|
||||||
|
//
|
||||||
|
// the HTTP method to use. Defaults to "GET".
|
||||||
|
//
|
||||||
|
httpMethod: "GET",
|
||||||
|
|
||||||
|
//
|
||||||
|
// if specified will perform a "httpMethod" request to the specified 'fileUrl' using the specified data.
|
||||||
|
// data must be an object (which will be $.param serialized) or already a key=value param string
|
||||||
|
//
|
||||||
|
data: null,
|
||||||
|
|
||||||
|
//
|
||||||
|
//a period in milliseconds to poll to determine if a successful file download has occured or not
|
||||||
|
//
|
||||||
|
checkInterval: 100,
|
||||||
|
|
||||||
|
//
|
||||||
|
//the cookie name to indicate if a file download has occured
|
||||||
|
//
|
||||||
|
cookieName: "fileDownload",
|
||||||
|
|
||||||
|
//
|
||||||
|
//the cookie value for the above name to indicate that a file download has occured
|
||||||
|
//
|
||||||
|
cookieValue: "true",
|
||||||
|
|
||||||
|
//
|
||||||
|
//the cookie path for above name value pair
|
||||||
|
//
|
||||||
|
cookiePath: "/",
|
||||||
|
|
||||||
|
//
|
||||||
|
//if specified it will be used when attempting to clear the above name value pair
|
||||||
|
//useful for when downloads are being served on a subdomain (e.g. downloads.example.com)
|
||||||
|
//
|
||||||
|
cookieDomain: null,
|
||||||
|
|
||||||
|
//
|
||||||
|
//the title for the popup second window as a download is processing in the case of a mobile browser
|
||||||
|
//
|
||||||
|
popupWindowTitle: "Initiating file download...",
|
||||||
|
|
||||||
|
//
|
||||||
|
//Functionality to encode HTML entities for a POST, need this if data is an object with properties whose values contains strings with quotation marks.
|
||||||
|
//HTML entity encoding is done by replacing all &,<,>,',",\r,\n characters.
|
||||||
|
//Note that some browsers will POST the string htmlentity-encoded whilst others will decode it before POSTing.
|
||||||
|
//It is recommended that on the server, htmlentity decoding is done irrespective.
|
||||||
|
//
|
||||||
|
encodeHTMLEntities: true
|
||||||
|
|
||||||
|
}, options);
|
||||||
|
|
||||||
|
var deferred = new $.Deferred();
|
||||||
|
|
||||||
|
//Setup mobile browser detection: Partial credit: http://detectmobilebrowser.com/
|
||||||
|
var userAgent = (navigator.userAgent || navigator.vendor || window.opera).toLowerCase();
|
||||||
|
|
||||||
|
var isIos; //has full support of features in iOS 4.0+, uses a new window to accomplish this.
|
||||||
|
var isAndroid; //has full support of GET features in 4.0+ by using a new window. Non-GET is completely unsupported by the browser. See above for specifying a message.
|
||||||
|
var isOtherMobileBrowser; //there is no way to reliably guess here so all other mobile devices will GET and POST to the current window.
|
||||||
|
|
||||||
|
if (/ip(ad|hone|od)/.test(userAgent)) {
|
||||||
|
|
||||||
|
isIos = true;
|
||||||
|
|
||||||
|
} else if (userAgent.indexOf('android') !== -1) {
|
||||||
|
|
||||||
|
isAndroid = true;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
isOtherMobileBrowser = /avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|playbook|silk|iemobile|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(userAgent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|e\-|e\/|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\-|2|g)|yas\-|your|zeto|zte\-/i.test(userAgent.substr(0, 4));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
var httpMethodUpper = settings.httpMethod.toUpperCase();
|
||||||
|
|
||||||
|
if (isAndroid && httpMethodUpper !== "GET" && settings.androidPostUnsupportedMessageHtml) {
|
||||||
|
//the stock android browser straight up doesn't support file downloads initiated by non GET requests: http://code.google.com/p/android/issues/detail?id=1780
|
||||||
|
|
||||||
|
if ($().dialog) {
|
||||||
|
$("<div>").html(settings.androidPostUnsupportedMessageHtml).dialog(settings.dialogOptions);
|
||||||
|
} else {
|
||||||
|
alert(settings.androidPostUnsupportedMessageHtml);
|
||||||
|
}
|
||||||
|
|
||||||
|
return deferred.reject();
|
||||||
|
}
|
||||||
|
|
||||||
|
var $preparingDialog = null;
|
||||||
|
|
||||||
|
var internalCallbacks = {
|
||||||
|
|
||||||
|
onPrepare: function (url) {
|
||||||
|
|
||||||
|
//wire up a jquery dialog to display the preparing message if specified
|
||||||
|
if (settings.preparingMessageHtml) {
|
||||||
|
|
||||||
|
$preparingDialog = $("<div>").html(settings.preparingMessageHtml).dialog(settings.dialogOptions);
|
||||||
|
|
||||||
|
} else if (settings.prepareCallback) {
|
||||||
|
|
||||||
|
settings.prepareCallback(url);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
|
||||||
|
onSuccess: function (url) {
|
||||||
|
|
||||||
|
//remove the perparing message if it was specified
|
||||||
|
if ($preparingDialog) {
|
||||||
|
$preparingDialog.dialog('close');
|
||||||
|
}
|
||||||
|
|
||||||
|
settings.successCallback(url);
|
||||||
|
|
||||||
|
deferred.resolve(url);
|
||||||
|
},
|
||||||
|
|
||||||
|
onAbort: function (url) {
|
||||||
|
|
||||||
|
//remove the perparing message if it was specified
|
||||||
|
if ($preparingDialog) {
|
||||||
|
$preparingDialog.dialog('close');
|
||||||
|
};
|
||||||
|
|
||||||
|
settings.abortCallback(url);
|
||||||
|
|
||||||
|
deferred.reject(url);
|
||||||
|
},
|
||||||
|
|
||||||
|
onFail: function (responseHtml, url, error) {
|
||||||
|
|
||||||
|
//remove the perparing message if it was specified
|
||||||
|
if ($preparingDialog) {
|
||||||
|
$preparingDialog.dialog('close');
|
||||||
|
}
|
||||||
|
|
||||||
|
//wire up a jquery dialog to display the fail message if specified
|
||||||
|
if (settings.failMessageHtml) {
|
||||||
|
$("<div>").html(settings.failMessageHtml).dialog(settings.dialogOptions);
|
||||||
|
}
|
||||||
|
|
||||||
|
settings.failCallback(responseHtml, url, error);
|
||||||
|
|
||||||
|
deferred.reject(responseHtml, url);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
internalCallbacks.onPrepare(fileUrl);
|
||||||
|
|
||||||
|
//make settings.data a param string if it exists and isn't already
|
||||||
|
if (settings.data !== null && typeof settings.data !== "string") {
|
||||||
|
settings.data = $.param(settings.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
var $iframe,
|
||||||
|
downloadWindow,
|
||||||
|
formDoc,
|
||||||
|
$form;
|
||||||
|
|
||||||
|
if (httpMethodUpper === "GET") {
|
||||||
|
|
||||||
|
if (settings.data !== null) {
|
||||||
|
//need to merge any fileUrl params with the data object
|
||||||
|
|
||||||
|
var qsStart = fileUrl.indexOf('?');
|
||||||
|
|
||||||
|
if (qsStart !== -1) {
|
||||||
|
//we have a querystring in the url
|
||||||
|
|
||||||
|
if (fileUrl.substring(fileUrl.length - 1) !== "&") {
|
||||||
|
fileUrl = fileUrl + "&";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
|
||||||
|
fileUrl = fileUrl + "?";
|
||||||
|
}
|
||||||
|
|
||||||
|
fileUrl = fileUrl + settings.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isIos || isAndroid) {
|
||||||
|
|
||||||
|
downloadWindow = window.open(fileUrl);
|
||||||
|
downloadWindow.document.title = settings.popupWindowTitle;
|
||||||
|
window.focus();
|
||||||
|
|
||||||
|
} else if (isOtherMobileBrowser) {
|
||||||
|
|
||||||
|
window.location(fileUrl);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
//create a temporary iframe that is used to request the fileUrl as a GET request
|
||||||
|
$iframe = $("<iframe style='display: none' src='"+fileUrl+"'></iframe>").appendTo("body");
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
var formInnerHtml = "";
|
||||||
|
|
||||||
|
if (settings.data !== null) {
|
||||||
|
|
||||||
|
$.each(settings.data.replace(/\+/g, ' ').split("&"), function () {
|
||||||
|
|
||||||
|
var kvp = this.split("=");
|
||||||
|
|
||||||
|
//Issue: When value contains sign '=' then the kvp array does have more than 2 items. We have to join value back
|
||||||
|
var k = kvp[0];
|
||||||
|
kvp.shift();
|
||||||
|
var v = kvp.join("=");
|
||||||
|
kvp = [k, v];
|
||||||
|
|
||||||
|
var key = settings.encodeHTMLEntities ? htmlSpecialCharsEntityEncode(decodeURIComponent(kvp[0])) : decodeURIComponent(kvp[0]);
|
||||||
|
if (key) {
|
||||||
|
var value = settings.encodeHTMLEntities ? htmlSpecialCharsEntityEncode(decodeURIComponent(kvp[1])) : decodeURIComponent(kvp[1]);
|
||||||
|
formInnerHtml += '<input type="hidden" name="' + key + '" value="' + value + '" />';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isOtherMobileBrowser) {
|
||||||
|
|
||||||
|
$form = $("<form>").appendTo("body");
|
||||||
|
$form.hide()
|
||||||
|
.prop('method', settings.httpMethod)
|
||||||
|
.prop('action', fileUrl)
|
||||||
|
.html(formInnerHtml);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (isIos) {
|
||||||
|
|
||||||
|
downloadWindow = window.open("about:blank");
|
||||||
|
downloadWindow.document.title = settings.popupWindowTitle;
|
||||||
|
formDoc = downloadWindow.document;
|
||||||
|
window.focus();
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
$iframe = $("<iframe style='display: none' src='about:blank'></iframe>").appendTo("body");
|
||||||
|
formDoc = getiframeDocument($iframe);
|
||||||
|
}
|
||||||
|
|
||||||
|
formDoc.write("<html><head></head><body><form method='" + settings.httpMethod + "' action='" + fileUrl + "'>" + formInnerHtml + "</form>" + settings.popupWindowTitle + "</body></html>");
|
||||||
|
$form = $(formDoc).find('form');
|
||||||
|
}
|
||||||
|
|
||||||
|
$form.submit();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//check if the file download has completed every checkInterval ms
|
||||||
|
setTimeout(checkFileDownloadComplete, settings.checkInterval);
|
||||||
|
|
||||||
|
|
||||||
|
function checkFileDownloadComplete() {
|
||||||
|
//has the cookie been written due to a file download occuring?
|
||||||
|
|
||||||
|
var cookieValue = settings.cookieValue;
|
||||||
|
if(typeof cookieValue == 'string') {
|
||||||
|
cookieValue = cookieValue.toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
var lowerCaseCookie = settings.cookieName.toLowerCase() + "=" + cookieValue;
|
||||||
|
|
||||||
|
if (document.cookie.toLowerCase().indexOf(lowerCaseCookie) > -1) {
|
||||||
|
|
||||||
|
//execute specified callback
|
||||||
|
internalCallbacks.onSuccess(fileUrl);
|
||||||
|
|
||||||
|
//remove cookie
|
||||||
|
var cookieData = settings.cookieName + "=; path=" + settings.cookiePath + "; expires=" + new Date(0).toUTCString() + ";";
|
||||||
|
if (settings.cookieDomain) cookieData += " domain=" + settings.cookieDomain + ";";
|
||||||
|
document.cookie = cookieData;
|
||||||
|
|
||||||
|
//remove iframe
|
||||||
|
cleanUp(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//has an error occured?
|
||||||
|
//if neither containers exist below then the file download is occuring on the current window
|
||||||
|
if (downloadWindow || $iframe) {
|
||||||
|
|
||||||
|
//has an error occured?
|
||||||
|
try {
|
||||||
|
|
||||||
|
var formDoc = downloadWindow ? downloadWindow.document : getiframeDocument($iframe);
|
||||||
|
|
||||||
|
if (formDoc && formDoc.body !== null && formDoc.body.innerHTML.length) {
|
||||||
|
|
||||||
|
var isFailure = true;
|
||||||
|
|
||||||
|
if ($form && $form.length) {
|
||||||
|
var $contents = $(formDoc.body).contents().first();
|
||||||
|
|
||||||
|
try {
|
||||||
|
if ($contents.length && $contents[0] === $form[0]) {
|
||||||
|
isFailure = false;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
if (e && e.number == -2146828218) {
|
||||||
|
// IE 8-10 throw a permission denied after the form reloads on the "$contents[0] === $form[0]" comparison
|
||||||
|
isFailure = true;
|
||||||
|
} else {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isFailure) {
|
||||||
|
// IE 8-10 don't always have the full content available right away, they need a litle bit to finish
|
||||||
|
setTimeout(function () {
|
||||||
|
internalCallbacks.onFail(formDoc.body.innerHTML, fileUrl);
|
||||||
|
cleanUp(true);
|
||||||
|
}, 100);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (err) {
|
||||||
|
|
||||||
|
//500 error less than IE9
|
||||||
|
internalCallbacks.onFail('', fileUrl, err);
|
||||||
|
|
||||||
|
cleanUp(true);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//keep checking...
|
||||||
|
setTimeout(checkFileDownloadComplete, settings.checkInterval);
|
||||||
|
}
|
||||||
|
|
||||||
|
//gets an iframes document in a cross browser compatible manner
|
||||||
|
function getiframeDocument($iframe) {
|
||||||
|
var iframeDoc = $iframe[0].contentWindow || $iframe[0].contentDocument;
|
||||||
|
if (iframeDoc.document) {
|
||||||
|
iframeDoc = iframeDoc.document;
|
||||||
|
}
|
||||||
|
return iframeDoc;
|
||||||
|
}
|
||||||
|
|
||||||
|
function cleanUp(isFailure) {
|
||||||
|
|
||||||
|
setTimeout(function() {
|
||||||
|
|
||||||
|
if (downloadWindow) {
|
||||||
|
|
||||||
|
if (isAndroid) {
|
||||||
|
downloadWindow.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isIos) {
|
||||||
|
if (downloadWindow.focus) {
|
||||||
|
downloadWindow.focus(); //ios safari bug doesn't allow a window to be closed unless it is focused
|
||||||
|
if (isFailure) {
|
||||||
|
downloadWindow.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//iframe cleanup appears to randomly cause the download to fail
|
||||||
|
//not doing it seems better than failure...
|
||||||
|
//if ($iframe) {
|
||||||
|
// $iframe.remove();
|
||||||
|
//}
|
||||||
|
|
||||||
|
}, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function htmlSpecialCharsEntityEncode(str) {
|
||||||
|
return str.replace(htmlSpecialCharsRegEx, function(match) {
|
||||||
|
return '&' + htmlSpecialCharsPlaceHolders[match];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
var promise = deferred.promise();
|
||||||
|
promise.abort = function() {
|
||||||
|
cleanUp();
|
||||||
|
$iframe.attr('src', '').html('');
|
||||||
|
internalCallbacks.onAbort(fileUrl);
|
||||||
|
};
|
||||||
|
return promise;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
})(jQuery, this || window);
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1,79 @@
|
|||||||
|
import React,{ Component } from "react";
|
||||||
|
import { getUrl2 } from "educoder";
|
||||||
|
|
||||||
|
const $ = window.$
|
||||||
|
let _url_origin = getUrl2()
|
||||||
|
|
||||||
|
class Clappr extends Component{
|
||||||
|
constructor(props){
|
||||||
|
super(props);
|
||||||
|
this.state={
|
||||||
|
}
|
||||||
|
}
|
||||||
|
componentDidMount() {
|
||||||
|
const source = this.props.source || "http://your.video/here.mp4"
|
||||||
|
const { id } = this.props
|
||||||
|
const _id = `#_player${id}`
|
||||||
|
if (window['Clappr']) {
|
||||||
|
const player = new window.Clappr.Player({
|
||||||
|
source: source, parentId: _id,
|
||||||
|
plugins: {
|
||||||
|
'core': [window.Clappr.MediaControl, window.Clappr.Playback]
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
$.getScript(
|
||||||
|
`${_url_origin}/javascripts/media/clappr.min.js`,
|
||||||
|
(data, textStatus, jqxhr) => {
|
||||||
|
window.clappr = window.Clappr
|
||||||
|
$.getScript(
|
||||||
|
`${_url_origin}/javascripts/media/clappr-playback-rate-plugin.min.js`,
|
||||||
|
(data, textStatus, jqxhr) => {
|
||||||
|
const player = new window.Clappr.Player({
|
||||||
|
source: source, parentId: _id,
|
||||||
|
plugins: {
|
||||||
|
'core': [window.Clappr.MediaControl, window['clappr-playback-rate-plugin'].default]
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
//
|
||||||
|
// $.when(
|
||||||
|
// $.getScript( `${_url_origin}/javascripts/media/clappr.min.js` ),
|
||||||
|
// // $.getScript( `${_url_origin}/javascripts/media/clappr-thumbnails-plugin.js` ),
|
||||||
|
// $.getScript( `${_url_origin}/javascripts/media/clappr-playback-rate-plugin.min.js` ),
|
||||||
|
// $.Deferred(function( deferred ){
|
||||||
|
// $( deferred.resolve );
|
||||||
|
// })
|
||||||
|
// ).done(function(){
|
||||||
|
// //place your code here, the scripts are all loaded
|
||||||
|
// const player = new window.Clappr.Player({
|
||||||
|
// source: source, parentId: _id,
|
||||||
|
// plugins: {
|
||||||
|
// 'core': [window.Clappr.MediaControl, window.Clappr.Playback]
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render(){
|
||||||
|
|
||||||
|
let { source, id, className } = this.props;
|
||||||
|
const _id = `_player${id}`
|
||||||
|
return(
|
||||||
|
<React.Fragment>
|
||||||
|
<style>{`
|
||||||
|
.playback_rate {
|
||||||
|
margin-right: 16px;
|
||||||
|
}
|
||||||
|
`}</style>
|
||||||
|
<div id={_id} className={className}></div>
|
||||||
|
</React.Fragment>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export default Clappr;
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
import React, { Component } from 'react';
|
||||||
|
|
||||||
|
class EffectDisplayContent extends Component {
|
||||||
|
constructor(props) {
|
||||||
|
super(props)
|
||||||
|
this.state = {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { typeName, content1, content2, content3 } = this.props;
|
||||||
|
return (
|
||||||
|
<div className="task-popup-content effectDisplay">
|
||||||
|
<style>{`
|
||||||
|
.effectDisplay .content_title {
|
||||||
|
flex: 1 1 0
|
||||||
|
}
|
||||||
|
.effectDisplay .content>div {
|
||||||
|
flex: 1
|
||||||
|
}
|
||||||
|
.effectDisplay .clappr {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.effectDisplay .clappr>div {
|
||||||
|
width: 400px !important;
|
||||||
|
}
|
||||||
|
`}</style>
|
||||||
|
<div className="clearfix df">
|
||||||
|
{content1 && <p className="content_title edu-txt-center fl mr03precent font-18">原始{typeName}</p>}
|
||||||
|
{content2 && <p className="content_title edu-txt-center fl font-18 mr03precent">实际输出{typeName}</p>}
|
||||||
|
{content3 && <p className="content_title edu-txt-center fl font-18 mr03precent">预期输出{typeName}</p>}
|
||||||
|
</div>
|
||||||
|
<div className="clearfix df content" >
|
||||||
|
{content1 && <div className="fl mr03precent pt10 mb50">
|
||||||
|
{content1}
|
||||||
|
</div>}
|
||||||
|
{content2 && <div className="fl mr03precent pt10 mb50">
|
||||||
|
{content2}
|
||||||
|
</div>}
|
||||||
|
{content3 && <div className="fl mr03precent pt10 mb50">
|
||||||
|
{content3}
|
||||||
|
</div>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default EffectDisplayContent;
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue