Commit 611d58d0 authored by 神楽坂玲奈's avatar 神楽坂玲奈

candy

parent ef06d662
...@@ -40,7 +40,9 @@ ...@@ -40,7 +40,9 @@
"options": { "options": {
"allowedCommonJsDependencies": [ "allowedCommonJsDependencies": [
"glob", "glob",
"aria2" "aria2",
"fast-glob",
"fs-extra"
], ],
"customWebpackConfig": {}, "customWebpackConfig": {},
"outputPath": "dist/mycard", "outputPath": "dist/mycard",
...@@ -59,18 +61,6 @@ ...@@ -59,18 +61,6 @@
}, },
"configurations": { "configurations": {
"production": { "production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
],
"fileReplacements": [ "fileReplacements": [
{ {
"replace": "src/environments/environment.ts", "replace": "src/environments/environment.ts",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
:host { :host {
flex-grow: 1; flex: 1;
position: relative; position: relative;
padding: 1rem 1rem 0 1rem; padding: 1rem 1rem 0 1rem;
background-blend-mode: color; background-blend-mode: color;
......
@import "~candy/res/default.css";
/* Turn on custom 8px wide scrollbar */
::-webkit-scrollbar {
width: 8px; /* 1px wider than Lion. */
/* This is more usable for users trying to click it. */
background-color: rgba(0, 0, 0, 0);
-webkit-border-radius: 100px;
}
/* hover effect for both scrollbar area, and scrollbar 'thumb' */
::-webkit-scrollbar:active {
background-color: rgba(0, 0, 0, 0.05);
}
/* The scrollbar 'thumb' ...that marque oval shape in a scrollbar */
::-webkit-scrollbar-thumb:vertical {
/* This is the EXACT color of Mac OS scrollbars.
Yes, I pulled out digital color meter */
background: rgba(0, 0, 0, 0.1);
-webkit-border-radius: 100px;
}
::-webkit-scrollbar-thumb:vertical:active {
background: rgba(0, 0, 0, 0.2); /* Some darker color when you click it */
-webkit-border-radius: 100px;
}
.scroll {
overflow-y: hidden;
}
.scroll:hover {
overflow-y: auto;
}
.message-pane-wrapper, .message-form-wrapper {
margin-right: 190px;
}
.roster-pane, #chat-toolbar {
width: 190px
}
#candy {
background-color: #f7f7f9;
}
#chat-tabs li {
box-shadow: 0 0 1px 1px #ccc;
}
#chat-tabs a {
color: #999;
background-color: #ececec;
}
#chat-tabs .active a.label {
background-color: white;
}
#chat-tabs .active .transition {
background: white none;
}
#chat-tabs .transition {
background: #ececec none;
}
.message-pane-wrapper {
background-color: white;
padding: 0;
}
.message-pane li {
border-bottom: none;
box-shadow: none;
padding: 0 5px;
}
.message-pane li > div {
padding: 0 0 0 150px;
line-height: 28px;
}
.message-pane .label {
margin-left: -150px;
width: 130px;
}
.roster-pane {
background-color: initial;
border-top: none;
box-shadow: none;
margin: 30px 0 32px 0;
}
.roster-pane .user {
border-bottom: none;
box-shadow: none;
color: black;
}
.roster-pane .user:hover {
background-color: #ebf3f8;
}
#chat-toolbar {
position: absolute;
background-color: initial;
border-top: 1px solid #eee;
box-shadow: none;
}
.message-form-wrapper {
position: absolute;
border-top: 1px solid #eee;
}
.message-form {
position: absolute;
margin-right: 20px;
}
.message-form input.submit {
position: absolute;
margin-right: 0
}
.roster-pane .label {
text-shadow: none
}
#candy {
border-top: 1px solid #eee;
box-shadow: inset 0 1px 2px white;
}
.usercount span {
background-color: initial;
color: #a7a7a7;
}
#chat-modal.modal-common {
position: absolute;
}
/*#context-menu {*/
/*margin-top: 0;*/
/*padding-top: 0;*/
/*}*/
#context-menu ul {
overflow-y: auto;
max-height: 170px;
}
/*#context-menu {*/
/**/
/*}*/
.message-pane {
-webkit-user-select: auto;
}
.roster-pane .user {
display: inherit;
opacity: inherit;
}
.hover-color{
color:#a7a7a7;
padding:0 5px;
}
.hover-color:hover{
color:#000;
}
<!--<div id="candy" data-MinOrMax="default">--> <div id="candy" data-MinOrMax="default">
<!--</div>--> </div>
<!--<div style="position:absolute; top:5px; right:10px;">--> <div style="position:absolute; top:5px; right:10px;">
<!-- <i id="minimize" class="fa fa-minus hover-color" (click)="minimize()" data-size="" i18n-title title="最小化"></i>--> <i id="minimize" class="fa fa-minus hover-color" (click)="minimize()" data-size="" i18n-title title="最小化"></i>
<!-- <i id="unminimize" class="fa fa-minus hover-color" (click)="restore()" data-size="" i18n-title title="取消最小化" hidden></i>--> <i id="unminimize" class="fa fa-minus hover-color" (click)="restore()" data-size="" i18n-title title="取消最小化" hidden></i>
<!-- <i id="restore" class="fa fa fa-chevron-down hover-color" (click)="restore()" data-size="" i18n-title title="还原" hidden></i>--> <i id="restore" class="fa fa fa-chevron-down hover-color" (click)="restore()" data-size="" i18n-title title="还原" hidden></i>
<!-- <i id="maximize" class="fa fa fa-chevron-up hover-color" (click)="maximize()" i18n-title title="最大化"></i>--> <i id="maximize" class="fa fa fa-chevron-up hover-color" (click)="maximize()" i18n-title title="最大化"></i>
<!--</div>--> </div>
import { Component, OnInit } from '@angular/core'; /**
* Created by zh99998 on 16/9/2.
*/
// let shadow: ShadowRoot;
//
// const $ = require('../jquery-shadow.js');
// $.fn.init = new Proxy($.fn.init, {
// construct(target, argumentsList, newTarget) {
// let [selector, context, root] = argumentsList;
// if (shadow) {
// if (selector === 'body') {
// selector = shadow;
// } else if (selector === document) {
// selector = $('#candy');
// } else if (!context) {
// context = shadow;
// }
// }
// return new target(selector, context, root);
// }
// });
const $ = require('jquery');
window['jQuery'] = $;
import Mustache from 'mustache';
import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
import { LoginService } from '../login/login.service';
import { SettingsService } from '../settings.service';
import { App } from '../shared/app';
// candy libs
import 'strophe.js';
import 'strophejs-plugin-disco';
import 'strophejs-plugin-roster';
import 'strophejs-plugin-muc';
import 'strophejs-plugin-caps';
import 'jquery-i18n/jquery.i18n.js';
import './date.format.js';
// candy
import { Candy } from 'candy';
import NotifyMe from 'candy-shop/notifyme/candy.js';
import crypto from 'crypto';
import NameComplete from 'candy-shop/namecomplete/candy.js';
import ModifyRole from 'candy-shop/modify-role/candy.js';
import MeDoes from 'candy-shop/me-does/candy.js';
import Notifications from 'candy-shop/notifications/candy.js';
import Refocus from 'candy-shop/refocus/candy.js';
// delete window['jQuery'];
// Candy fix
// declare const Candy: any;
// declare const CandyShop: any;
window['MD5'] = {
hexdigest(s: string) {
return crypto.createHash('sha256').update(s).digest('hex');
},
};
// @ts-ignore
Mustache.to_html = function (template, view, partials, send) {
const result = Mustache.render(template, view, partials);
if (typeof send === 'function') {
send(result);
} else {
return result;
}
};
// Candy.Util.getPosLeftAccordingToWindowBounds = new Proxy(Candy.Util.getPosLeftAccordingToWindowBounds, {
// apply(target, thisArg, argumentsList) {
// argumentsList[1] -= shadow.host.getBoundingClientRect().left;
// return target.apply(thisArg, argumentsList);
// },
// });
// Candy.Util.getPosTopAccordingToWindowBounds = new Proxy(Candy.Util.getPosTopAccordingToWindowBounds, {
// apply(target, thisArg, argumentsList) {
// argumentsList[1] -= shadow.host.getBoundingClientRect().top;
// return target.apply(thisArg, argumentsList);
// },
// });
// 性能优化:禁用加入动画
Candy.View.Pane.Roster.joinAnimation = function () {};
// 性能优化:禁用用户排序
Candy.View.Pane.Roster._insertUser = function (roomJid: string, roomId: string, user: any, userId: string, currentUser: any) {
let contact = user.getContact();
// @ts-ignore
let html = Mustache.to_html(Candy.View.Template.Roster.user, {
roomId: roomId,
userId: userId,
userJid: user.getJid(),
realJid: user.getRealJid(),
status: user.getStatus(),
contact_status: contact ? contact.getStatus() : 'unavailable',
nick: user.getNick(),
displayNick: Candy.Util.crop(user.getNick(), Candy.View.getOptions().crop.roster.nickname),
role: user.getRole(),
affiliation: user.getAffiliation(),
me: currentUser !== undefined && user.getNick() === currentUser.getNick(),
// tooltipRole: $.i18n._('tooltipRole'),
// tooltipIgnored: $.i18n._('tooltipIgnored'),
});
let rosterPane = Candy.View.Pane.Room.getPane(roomJid, '.roster-pane');
rosterPane.append(html);
};
// 性能优化:将未读消息计数的的 jQuery show() 改为直接置 style
Candy.View.Pane.Chat.increaseUnreadMessages = function (roomJid: string) {
let unreadElem = this.getTab(roomJid).find('.unread');
unreadElem.text(unreadElem.text() !== '' ? parseInt(unreadElem.text(), 10) + 1 : 1);
unreadElem[0].style.display = 'inherit';
// only increase window unread messages in private chats
if (Candy.View.Pane.Chat.rooms[roomJid].type === 'chat' || Candy.View.getOptions().updateWindowOnAllMessages === true) {
Candy.View.Pane.Window.increaseUnreadMessages();
}
};
// 性能优化:将收到消息时的滚动放进requestIdleCallback
declare const requestIdleCallback: Function;
// tslint:disable-next-line:max-line-length
Candy.View.Pane.Message.show = function (
roomJid: any,
name: any,
message: any,
xhtmlMessage: any,
timestamp: any,
from: any,
carbon: any,
stanza: any
) {
message = Candy.Util.Parser.all(message.substring(0, Candy.View.getOptions().crop.message.body));
if (Candy.View.getOptions().enableXHTML === true && xhtmlMessage) {
xhtmlMessage = Candy.Util.parseAndCropXhtml(xhtmlMessage, Candy.View.getOptions().crop.message.body);
}
timestamp = timestamp || new Date();
// Assume we have an ISO-8601 date string and convert it to a Date object
if (!timestamp.toDateString) {
timestamp = Candy.Util.iso8601toDate(timestamp);
}
// Before we add the new message, check to see if we should be automatically scrolling or not.
let messagePane = Candy.View.Pane.Room.getPane(roomJid, '.message-pane');
let enableScroll;
if (stanza && stanza.children('delay').length > 0) {
enableScroll = true;
} else {
enableScroll =
messagePane.scrollTop() + messagePane.outerHeight() === messagePane.prop('scrollHeight') || !$(messagePane).is(':visible');
}
Candy.View.Pane.Chat.rooms[roomJid].enableScroll = enableScroll;
let evtData: any = {
roomJid: roomJid,
name: name,
message: message,
xhtmlMessage: xhtmlMessage,
from: from,
stanza: stanza,
};
if ($(Candy).triggerHandler('candy:view.message.before-show', evtData) === false) {
return;
}
message = evtData.message;
xhtmlMessage = evtData.xhtmlMessage;
if (xhtmlMessage !== undefined && xhtmlMessage.length > 0) {
message = xhtmlMessage;
}
if (!message) {
return;
}
let renderEvtData = {
template: Candy.View.Template.Message.item,
templateData: {
name: name,
displayName: Candy.Util.crop(name, Candy.View.getOptions().crop.message.nickname),
message: message,
time: Candy.Util.localizedTime(timestamp),
timestamp: timestamp.toISOString(),
roomjid: roomJid,
from: from,
},
stanza: stanza,
};
$(Candy).triggerHandler('candy:view.message.before-render', renderEvtData);
// @ts-ignore
let html = Mustache.to_html(renderEvtData.template, renderEvtData.templateData);
Candy.View.Pane.Room.appendToMessagePane(roomJid, html);
let elem = Candy.View.Pane.Room.getPane(roomJid, '.message-pane').children().last();
// click on username opens private chat
// @ts-ignore
elem.find('a.label').click(function (event: any) {
event.preventDefault();
// Check if user is online and not myCandy.View.Pane
let room = Candy.Core.getRoom(roomJid);
if (
room &&
name !== Candy.View.Pane.Room.getUser(Candy.View.getCurrent().roomJid).getNick() &&
room.getRoster().get(roomJid + '/' + name)
) {
if (Candy.View.Pane.PrivateRoom.open(roomJid + '/' + name, name, true) === false) {
return false;
}
}
});
if (!carbon) {
let notifyEvtData = {
name: name,
displayName: Candy.Util.crop(name, Candy.View.getOptions().crop.message.nickname),
roomJid: roomJid,
message: message,
time: Candy.Util.localizedTime(timestamp),
timestamp: timestamp.toISOString(),
};
$(Candy).triggerHandler('candy:view.message.notify', notifyEvtData);
// Check to see if in-core notifications are disabled
if (!Candy.Core.getOptions().disableCoreNotifications) {
if (Candy.View.getCurrent().roomJid !== roomJid || !Candy.View.Pane.Window.hasFocus()) {
Candy.View.Pane.Chat.increaseUnreadMessages(roomJid);
if (!Candy.View.Pane.Window.hasFocus()) {
// Notify the user about a new private message OR on all messages if configured
if (Candy.View.Pane.Chat.rooms[roomJid].type === 'chat' || Candy.View.getOptions().updateWindowOnAllMessages === true) {
Candy.View.Pane.Chat.Toolbar.playSound();
}
}
}
}
if (Candy.View.getCurrent().roomJid === roomJid) {
requestIdleCallback(function () {
Candy.View.Pane.Room.scrollToBottom(roomJid);
});
}
}
evtData.element = elem;
$(Candy).triggerHandler('candy:view.message.after-show', evtData);
};
document['__defineGetter__']('cookie', () => 'candy-nostatusmessages');
document['__defineSetter__']('cookie', () => true);
declare const Strophe: any;
declare const $iq: any;
@Component({ @Component({
selector: 'app-candy', selector: 'app-candy',
templateUrl: './candy.component.html', templateUrl: 'candy.component.html',
styleUrls: ['./candy.component.css'] styleUrls: ['candy.component.css'],
encapsulation: ViewEncapsulation.None,
}) })
export class CandyComponent implements OnInit { export class CandyComponent implements OnInit, OnChanges {
@Input()
currentApp: App;
jid: string;
password: string;
nickname: string;
// ismin_window:Boolean=false;
// ismax_window:Boolean=false;
height_default_window: string = '230px';
constructor(private loginService: LoginService, private settingsService: SettingsService, private element: ElementRef) {}
ngOnInit() {
this.jid = this.loginService.user.username + '@mycard.moe';
this.password = this.loginService.user.external_id.toString();
this.nickname = this.loginService.user.username;
// shadow = this.element.nativeElement.shadowRoot;
//
// // 很 Tricky 的加载 Candy 的 css,这里涉及图片等资源的相对路径引用问题,如果丢给 Angular 去加载,会让相对路径找不到
// const element = document.createElement('style');
// element.innerHTML = `
// @import "node_modules/font-awesome/css/font-awesome.min.css";
// @import "node_modules/candy/libs.min.css";
// @import "node_modules/candy/res/default.css";
// @import "node_modules/candy-shop/notifyme/candy.css";
// @import "node_modules/candy-shop/namecomplete/candy.css";
// @import "node_modules/candy-shop/modify-role/candy.css";
// `;
// shadow.insertBefore(element, shadow.firstChild);
Candy.View.Template.Login.form = `
<form method='post' id='login-form' class='login-form'>
<input type='hidden' id='nickname' name='nickname' value='${this.nickname}'/>
{{#displayUsername}}
<input type='hidden' id='username' name='username' value='${this.jid}'/>
{{#displayDomain}}
<span class='at-symbol'>@</span>
<select id='domain' name='domain'>{{#domains}}<option value='{{domain}}'>{{domain}}</option>{{/domains}}</select>
{{/displayDomain}}
{{/displayUsername}}
{{#presetJid}}<input type='hidden' id='username' name='username' value='{{presetJid}}'/>{{/presetJid}}
{{#displayPassword}}<input type='hidden' id='password' name='password' value='${this.password}'/>{{/displayPassword}}
<input type='submit' class='button' value='{{_loginSubmit}}' />
</form>
`;
Candy.init('wss://chat.mycard.moe:5443/ws', {
core: {
debug: false,
autojoin: this.currentApp.conference && [this.currentApp.conference + '@conference.mycard.moe'],
resource: 'mycard-' + Math.random().toString().split('.')[1],
},
view: {
assets: 'candy/res/', // copy-webpack-plugin
language: this.settingsService.getLocale().startsWith('zh') ? 'cn' : 'en',
enableXHTML: true,
},
});
NotifyMe.init();
NameComplete.init();
ModifyRole.init();
MeDoes.init();
Notifications.init();
Refocus.init();
constructor() { Candy.Core.connect(this.jid, this.password, this.nickname);
// $(Candy).on('candy:core:roster:loaded', (event: JQueryEventObject, data: any) => {
// this.roster = Object.values(data.roster.getAll());
// });
// $(Candy).on('candy:core:roster:fetched', (event: JQueryEventObject, data: any) => {
// this.roster = Object.values(data.roster.getAll());
// });
// $(Candy).on('candy:core:roster:removed', (event: JQueryEventObject, data: any) => {
// this.roster = Object.values(Candy.Core.getRoster().getAll());
// });
// $(Candy).on('candy:core:roster:added', (event: JQueryEventObject, data: any) => {
// this.roster = Object.values(Candy.Core.getRoster().getAll());
// });
// $(Candy).on('candy:core:roster:updated', (event: JQueryEventObject, data: any) => {
// this.roster = Object.values(Candy.Core.getRoster().getAll());
// });
}
ngOnChanges(changes: SimpleChanges): void {
if (!Candy.Core.getConnection()) {
return;
}
let conference = changes['currentApp'].currentValue.conference;
if (!conference) {
return;
}
conference += '@conference.mycard.moe';
try {
if (Candy.View.Pane.Chat.rooms[conference]) {
Candy.View.Pane.Room.show(conference);
} else {
Candy.Core.Action.Jabber.Room.Join(conference);
}
} catch (error) {}
}
minimize(): void {
// let minimize:HTMLElement = $('#minimize')[0];
// let maximized:HTMLElement = $('#maximized')[0];
// let un_minimize:HTMLElement = $('#un_minimize')[0];
// let un_maximized:HTMLElement = $('#un_maximized')[0];
$('#candy').attr('data-minormax', 'min');
document.getElementById('candy-wrapper')!.style.height = '31px';
$('#mobile-roster-icon').css('display', 'none');
$('#chat-toolbar').css('display', 'none');
$('#chat-rooms').css('display', 'none');
$('#context-menu').css('display', 'none');
$('#mobile-roster-icon').css('display', 'none');
$('#minimize').hide();
$('#unminimize').show();
$('#restore').hide();
$('#maximize').show();
} }
ngOnInit(): void { restore(): void {
$('#candy').attr('data-minormax', 'default');
document.getElementById('candy-wrapper')!.style!.height = this.height_default_window;
$('#mobile-roster-icon').css('display', 'block');
$('#chat-toolbar').css('display', 'block');
$('#chat-rooms').css('display', 'block');
$('#context-menu').css('display', 'block');
$('#mobile-roster-icon').css('display', 'block');
$('#minimize').show();
$('#unminimize').hide();
$('#restore').hide();
$('#maximize').show();
} }
maximize(): void {
$('#candy').attr('data-minormax', 'max');
document.getElementById('candy-wrapper')!.style!.height = 'calc( 100% - 180px )';
$('#mobile-roster-icon').css('display', 'block');
$('#chat-toolbar').css('display', 'block');
$('#chat-rooms').css('display', 'block');
$('#context-menu').css('display', 'block');
$('#mobile-roster-icon').css('display', 'block');
$('#minimize').show();
$('#unminimize').hide();
$('#restore').show();
$('#maximize').hide();
}
} }
/*
* Date Format 1.2.3
* (c) 2007-2009 Steven Levithan <stevenlevithan.com>
* MIT license
*
* Includes enhancements by Scott Trenda <scott.trenda.net>
* and Kris Kowal <cixar.com/~kris.kowal/>
*
* Accepts a date, a mask, or a date and a mask.
* Returns a formatted version of the given date.
* The date defaults to the current date/time.
* The mask defaults to dateFormat.masks.default.
*/
var dateFormat = function () {
var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
timezoneClip = /[^-+\dA-Z]/g,
pad = function (val, len) {
val = String(val);
len = len || 2;
while (val.length < len) val = "0" + val;
return val;
};
// Regexes and supporting functions are cached through closure
return function (date, mask, utc) {
var dF = dateFormat;
// You can't provide utc if you skip other args (use the "UTC:" mask prefix)
if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
mask = date;
date = undefined;
}
// Passing date through Date applies Date.parse, if necessary
date = date ? new Date(date) : new Date;
if (isNaN(date)) throw SyntaxError("invalid date");
mask = String(dF.masks[mask] || mask || dF.masks["default"]);
// Allow setting the utc argument via the mask
if (mask.slice(0, 4) == "UTC:") {
mask = mask.slice(4);
utc = true;
}
var _ = utc ? "getUTC" : "get",
d = date[_ + "Date"](),
D = date[_ + "Day"](),
m = date[_ + "Month"](),
y = date[_ + "FullYear"](),
H = date[_ + "Hours"](),
M = date[_ + "Minutes"](),
s = date[_ + "Seconds"](),
L = date[_ + "Milliseconds"](),
o = utc ? 0 : date.getTimezoneOffset(),
flags = {
d: d,
dd: pad(d),
ddd: dF.i18n.dayNames[D],
dddd: dF.i18n.dayNames[D + 7],
m: m + 1,
mm: pad(m + 1),
mmm: dF.i18n.monthNames[m],
mmmm: dF.i18n.monthNames[m + 12],
yy: String(y).slice(2),
yyyy: y,
h: H % 12 || 12,
hh: pad(H % 12 || 12),
H: H,
HH: pad(H),
M: M,
MM: pad(M),
s: s,
ss: pad(s),
l: pad(L, 3),
L: pad(L > 99 ? Math.round(L / 10) : L),
t: H < 12 ? "a" : "p",
tt: H < 12 ? "am" : "pm",
T: H < 12 ? "A" : "P",
TT: H < 12 ? "AM" : "PM",
Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
};
return mask.replace(token, function ($0) {
return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
});
};
}();
// Some common format strings
dateFormat.masks = {
"default": "ddd mmm dd yyyy HH:MM:ss",
shortDate: "m/d/yy",
mediumDate: "mmm d, yyyy",
longDate: "mmmm d, yyyy",
fullDate: "dddd, mmmm d, yyyy",
shortTime: "h:MM TT",
mediumTime: "h:MM:ss TT",
longTime: "h:MM:ss TT Z",
isoDate: "yyyy-mm-dd",
isoTime: "HH:MM:ss",
isoDateTime: "yyyy-mm-dd'T'HH:MM:ss",
isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
};
// Internationalization strings
dateFormat.i18n = {
dayNames: [
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
],
monthNames: [
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
]
};
// For convenience...
Date.prototype.format = function (mask, utc) {
return dateFormat(this, mask, utc);
};
:host { :host {
display: flex; display: flex;
height: 100%;
} }
#right { #right {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-grow: 1; flex: 1;
} }
#main { #main {
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<div class='resize-wrapper resize-top' id='candy-wrapper' style='max-height: calc( 100% - 180px )'> <div class='resize-wrapper resize-top' id='candy-wrapper' style='max-height: calc( 100% - 180px )'>
<div (mousedown)='mousedown($event)' class='resize'></div> <div (mousedown)='mousedown($event)' class='resize'></div>
<candy *ngIf='currentApp' [currentApp]='currentApp'></candy> <app-candy *ngIf='currentApp' [currentApp]='currentApp'></app-candy>
</div> </div>
</div> </div>
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
/*background-color: white;*/ /*background-color: white;*/
/*}*/ /*}*/
.page { .page {
flex-grow: 1; flex: 1;
overflow: hidden;
/*margin-bottom: 60px;*/ /*margin-bottom: 60px;*/
} }
......
const CopyPlugin = require('copy-webpack-plugin');
module.exports = { module.exports = {
target: 'electron-renderer', target: 'electron-renderer',
externals: Object.fromEntries(['bufferutil', 'utf-8-validate'].map((pkg) => [pkg, `commonjs2 ${pkg}`])), externals: Object.fromEntries(['bufferutil', 'utf-8-validate'].map((pkg) => [pkg, `commonjs2 ${pkg}`])),
plugins: [
new CopyPlugin({
patterns: [{ from: 'node_modules/candy/res', to: 'candy/res' }],
}),
],
module: {
rules: [
{
test: require.resolve('candy'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'default mustache Mustache'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['Candy'],
},
},
],
},
{
test: require.resolve('jquery-i18n/jquery.i18n.js'),
loader: 'imports-loader',
options: {
type: 'commonjs',
imports: 'single jquery jQuery',
},
},
{
test: require.resolve('candy-shop/notifyme/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.NotifyMe'],
},
},
],
},
{
test: require.resolve('candy-shop/namecomplete/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.NameComplete'],
},
},
],
},
{
test: require.resolve('candy-shop/modify-role/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.ModifyRole'],
},
},
],
},
{
test: require.resolve('candy-shop/me-does/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.MeDoes'],
},
},
],
},
{
test: require.resolve('candy-shop/notifications/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.Notifications'],
},
},
],
},
{
test: require.resolve('candy-shop/refocus/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.Refocus'],
},
},
],
},
],
},
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment