the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-10-01 17:34:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Added q.min file

Browse source
This commit is contained in:
RainLoop Team 2015-03-26 02:16:53 +04:00
parent ed7acaa33f
commit c4aabb0cd4
7 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev/Screen/User/Settings.js
View file

@ -13,6 +13,7 @@
Plugins = require('Common/Plugins'), Plugins = require('Common/Plugins'),
AppStore = require('Stores/User/App'), AppStore = require('Stores/User/App'),
AccountStore = require('Stores/User/Account'),
Settings = require('Storage/Settings'), Settings = require('Storage/Settings'),
kn = require('Knoin/Knoin'), kn = require('Knoin/Knoin'),
@ -71,7 +72,8 @@
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security'); 'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
} }
if ((Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) || if (AccountStore.isRootAccount() &&
(Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) ||
Settings.settingsGet('AllowFacebookSocial') || Settings.settingsGet('AllowFacebookSocial') ||
Settings.settingsGet('AllowTwitterSocial')) Settings.settingsGet('AllowTwitterSocial'))
{ {

10
dev/Stores/User/Account.js
View file

@ -16,6 +16,7 @@
function AccountUserStore() function AccountUserStore()
{ {
this.email = ko.observable(''); this.email = ko.observable('');
this.parentEmail = ko.observable('');
// this.incLogin = ko.observable(''); // this.incLogin = ko.observable('');
// this.outLogin = ko.observable(''); // this.outLogin = ko.observable('');
@ -54,6 +55,15 @@
AccountUserStore.prototype.populate = function () AccountUserStore.prototype.populate = function ()
{ {
this.email(Settings.settingsGet('Email')); this.email(Settings.settingsGet('Email'));
this.parentEmail(Settings.settingsGet('ParentEmail'));
};
/**
* @returns {boolean}
*/
AccountUserStore.prototype.isRootAccount = function ()
{
return '' === this.parentEmail();
}; };
module.exports = new AccountUserStore(); module.exports = new AccountUserStore();

2
dev/View/Popup/Compose.js
View file

@ -476,7 +476,7 @@
self.addDropboxAttachment(aFiles[0]); self.addDropboxAttachment(aFiles[0]);
} }
}, },
'linkType': "direct", 'linkType': 'direct',
'multiselect': false 'multiselect': false
}); });
} }

9
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1636,15 +1636,6 @@ class Actions
$aResult['ParentEmail'] = $oAccount->ParentEmail(); $aResult['ParentEmail'] = $oAccount->ParentEmail();
} }
if (0 < \strlen($aResult['ParentEmail']))
{
$aResult['AllowGoogleSocial'] = false;
$aResult['AllowGoogleSocialAuth'] = false;
$aResult['AllowGoogleSocialDrive'] = false;
$aResult['AllowFacebookSocial'] = false;
$aResult['AllowTwitterSocial'] = false;
}
$sStaticCache = \md5(APP_VERSION.$this->Plugins()->Hash()); $sStaticCache = \md5(APP_VERSION.$this->Plugins()->Hash());
$sTheme = $this->ValidateTheme($sTheme); $sTheme = $this->ValidateTheme($sTheme);

4
rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
View file

@ -179,9 +179,9 @@
</div> </div>
<div class="pull-right" style="margin-right: 4px;"> <div class="pull-right" style="margin-right: 4px;">
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<a class="btn btn-thin first" data-tooltip-placement="top" <a class="btn first" data-tooltip-placement="top"
data-bind="visible: addAttachmentEnabled(), initDom: composeUploaderButton, tooltip: 'COMPOSE/ATTACH_FILES'"> data-bind="visible: addAttachmentEnabled(), initDom: composeUploaderButton, tooltip: 'COMPOSE/ATTACH_FILES'">
<b>+</b>&nbsp;<i class="icon-attachment"></i> <sup style="font-weight: bold; font-size: 100%; top: -0.3em;">+</sup><i class="icon-attachment"></i>
</a> </a>
<a class="btn" data-tooltip-placement="top" <a class="btn" data-tooltip-placement="top"
data-bind="visible: dropboxEnabled, command: dropboxCommand, tooltip: 'COMPOSE/DROPBOX', css: {'first': !addAttachmentEnabled(), 'last': !driveEnabled()}"> data-bind="visible: dropboxEnabled, command: dropboxCommand, tooltip: 'COMPOSE/DROPBOX', css: {'first': !addAttachmentEnabled(), 'last': !driveEnabled()}">

14
vendors/Q/.gitignore vendored
View file

@ -1,14 +0,0 @@
node_modules
npm-debug.log
CHANGES.html
README.html
.tmp
q.min.js
.coverage_data/
.coverage_debug/
cover_html/
# IntelliJ IDEA project files
.idea
*.iml

2
vendors/Q/q.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long