Merge branch 'feature-batch' into pre-release

Conflicts:
	public/langs/zh-cn.js
	public/langs/zh-hk.js
This commit is contained in:
life
2015-10-26 23:16:32 +08:00
14 changed files with 1355 additions and 323 deletions

View File

@@ -1512,6 +1512,11 @@ var Pren = {
},
togglePren: function(isToggleView) {
var me = this;
alert(getMsg('Please select a note firstly.'));
// 批量操作时, 不能prenstation
if (Note.inBatch) {
return;
}
if(!isToggleView) {
try {
gui.win.setKiosk(!me._isPren);