Skip to content

Commit 2986688

Browse files
hoorayhooray
committed
将原有窗口应用叫“app”的规范为“window”
1 parent 00311b7 commit 2986688

8 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎ajax.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
$app = array();
191191
if(checkLogin()){
192192
switch($type){
193-
case 'app':
193+
case 'window':
194194
case 'widget':
195195
$rs = $db->select(0, 1, 'tb_member_app', '*', 'and realid = '.(int)$id.' and member_id = '.session('member_id'));
196196
if($rs != NULL){
@@ -209,7 +209,7 @@
209209
$app['isopenmax'] = $rs['isopenmax'];
210210
$app['issetbar'] = $rs['issetbar'];
211211
$app['isflash'] = $rs['isflash'];
212-
if($rs['type'] == 'app' || $rs['type'] == 'widget'){
212+
if($rs['type'] == 'window' || $rs['type'] == 'widget'){
213213
$realurl = $db->select(0, 1, 'tb_app', 'url', 'and tbid = '.$rs['realid']);
214214
$app['url'] = $realurl['url'];
215215
}else{
@@ -219,7 +219,7 @@
219219
$app['error'] = 'ERROR_NOT_INSTALLED';
220220
}
221221
break;
222-
case 'papp':
222+
case 'pwindow':
223223
case 'pwidget':
224224
case 'folder':
225225
$rs = $db->select(0, 1, 'tb_member_app', '*', 'and tbid = '.(int)$id.' and member_id = '.session('member_id'));

‎inc/functions.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ function addApp($opt){
633633
);
634634
$appid = $db->insert(0, 2, 'tb_member_app', $set);
635635
break;
636-
case 'papp':
636+
case 'pwindow':
637637
case 'pwidget':
638638
$set = array(
639639
'icon = "'.$opt['icon'].'"',
@@ -700,12 +700,12 @@ function delApp($id){
700700
}
701701
delAppStr((int)$id);
702702
break;
703-
case 'app':
703+
case 'window':
704704
case 'widget':
705705
delAppStr((int)$id);
706706
$db->update(0, 0, 'tb_app', 'usecount = usecount - 1', 'and tbid = '.$member_app['realid']);
707707
break;
708-
case 'papp':
708+
case 'pwindow':
709709
case 'pwidget':
710710
delAppStr((int)$id);
711711
break;

‎js/hros.app.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ HROS.app = (function(){
2727
HROS.popupMenu.hide();
2828
var popupmenu;
2929
switch($(this).attr('type')){
30-
case 'app':
30+
case 'window':
3131
case 'widget':
3232
popupmenu = HROS.popupMenu.app($(this));
3333
break;
34-
case 'papp':
34+
case 'pwindow':
3535
case 'pwidget':
3636
popupmenu = HROS.popupMenu.papp($(this));
3737
break;
@@ -263,8 +263,8 @@ HROS.app = (function(){
263263
//判断是否移动应用，如果没有则判断为click事件
264264
if(dx == cx && dy == cy){
265265
switch(oldobj.attr('type')){
266-
case 'app':
267-
case 'papp':
266+
case 'window':
267+
case 'pwindow':
268268
HROS.window.create(oldobj.attr('realappid'), oldobj.attr('type'));
269269
break;
270270
case 'widget':
@@ -393,8 +393,8 @@ HROS.app = (function(){
393393
//判断是否移动应用，如果没有则判断为click事件
394394
if(dx == cx && dy == cy){
395395
switch(oldobj.attr('type')){
396-
case 'app':
397-
case 'papp':
396+
case 'window':
397+
case 'pwindow':
398398
HROS.window.create(oldobj.attr('realappid'), oldobj.attr('type'));
399399
break;
400400
case 'widget':
@@ -523,8 +523,8 @@ HROS.app = (function(){
523523
//判断是否移动应用，如果没有则判断为click事件
524524
if(dx == cx && dy == cy){
525525
switch(oldobj.attr('type')){
526-
case 'app':
527-
case 'papp':
526+
case 'window':
527+
case 'pwindow':
528528
HROS.window.create(oldobj.attr('realappid'), oldobj.attr('type'));
529529
break;
530530
case 'widget':

‎js/hros.window.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ HROS.window = (function(){
2525
$('.popup-menu').hide();
2626
$('.quick_view_container').remove();
2727
switch($(this).attr('type')){
28-
case 'app':
28+
case 'window':
2929
case 'widget':
3030
var popupmenu = HROS.popupMenu.app($(this));
3131
break;
32-
case 'papp':
32+
case 'pwindow':
3333
case 'pwidget':
3434
var popupmenu = HROS.popupMenu.papp($(this));
3535
break;
@@ -50,7 +50,7 @@ HROS.window = (function(){
5050
** 示例：HROS.window.createTemp({title:"百度",url:"http://www.baidu.com",width:800,height:400,isresize:false,isopenmax:false,isflash:false});
5151
*/
5252
createTemp : function(obj){
53-
var type = 'app', appid = obj.appid == null ? Date.parse(new Date()) : obj.appid;
53+
var type = 'window', appid = obj.appid == null ? Date.parse(new Date()) : obj.appid;
5454
//判断窗口是否已打开
5555
var iswindowopen = false;
5656
$('#task-content-inner a.task-item').each(function(){
@@ -134,7 +134,7 @@ HROS.window = (function(){
134134
** 示例：HROS.window.create(12);
135135
*/
136136
create : function(realappid, type){
137-
var type = type == null ? 'app' : type, appid;
137+
var type = type == null ? 'window' : type, appid;
138138
//判断窗口是否已打开
139139
var iswindowopen = false;
140140
$('#task-content-inner a.task-item').each(function(){
@@ -153,8 +153,8 @@ HROS.window = (function(){
153153
var top = ($(window).height() - options.height) / 2 <= 0 ? 0 : ($(window).height() - options.height) / 2;
154154
var left = ($(window).width() - options.width) / 2 <= 0 ? 0 : ($(window).width() - options.width) / 2;
155155
switch(options.type){
156-
case 'app':
157-
case 'papp':
156+
case 'window':
157+
case 'pwindow':
158158
//新增任务栏
159159
$('#task-content-inner').prepend(taskTemp({
160160
'type' : options.type,

‎sysapp/appmanage/detail.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}else{
2020
//给个初始值
2121
$app = array(
22-
'type' => 'app',
22+
'type' => 'window',
2323
'isresize' => 1,
2424
'isopenmax' => 0,
2525
'isflash' => 0,
@@ -117,7 +117,7 @@
117117
<div class="input-label">
118118
<label class="label-text">应用类型：</label>
119119
<div class="label-box form-inline control-group">
120-
<label class="radio" style="margin-right:10px"><input type="radio" name="val_type" value="app" <?php if($app['type'] == 'app'){echo 'checked';} ?>>窗口</label>
120+
<label class="radio" style="margin-right:10px"><input type="radio" name="val_type" value="window" <?php if($app['type'] == 'window'){echo 'checked';} ?>>窗口</label>
121121
<label class="radio"><input type="radio" name="val_type" value="widget" <?php if($app['type'] == 'widget'){echo 'checked';} ?>>挂件</label>
122122
</div>
123123
</div>
@@ -233,7 +233,7 @@
233233
}
234234
});
235235
$('input[name="val_type"]').change(function(){
236-
if($(this).val() == 'app'){
236+
if($(this).val() == 'window'){
237237
$('.input-label-isresize, .input-label-isopenmax, .input-label-isflash').slideDown();
238238
}else{
239239
$('input[name="val_isresize"]').each(function(){
@@ -359,7 +359,7 @@
359359
});
360360
$('#btn-preview').on('click', function(){
361361
if(form.check()){
362-
if($('input[name="val_type"]:checked').val() == 'app'){
362+
if($('input[name="val_type"]:checked').val() == 'window'){
363363
window.top.HROS.window.createTemp({
364364
title : $('input[name="val_name"]').val(),
365365
url : $('input[name="val_url"]').val(),

‎sysapp/appmanage/index.ajax.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
foreach($rs as $v){
2626
echo '<tr class="list-bd">';
2727
echo '<td style="text-align:left;padding-left:15px"><img src="../../'.$v['icon'].'" alt="'.$v['name'].'" class="appicon"><span class="appname">'.$v['name'].'</span></td>';
28-
echo '<td>'.($v['type'] == 'app' ? '窗口' : '挂件').'</td>';
28+
echo '<td>'.($v['type'] == 'window' ? '窗口' : '挂件').'</td>';
2929
echo '<td>'.($v['app_category_id'] == 0 ? '未分类' : $category[$v['app_category_id']]).'</td>';
3030
echo '<td>'.$v['usecount'].'</td>';
3131
echo '<td>';

‎sysapp/appmanage/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<label style="margin-left:10px">类型：</label>
5353
<select name="search_3" id="search_3" style="width:140px">
5454
<option value="">全部</option>
55-
<option value="app">窗口</option>
55+
<option value="window">窗口</option>
5656
<option value="widget">挂件</option>
5757
</select>
5858
<label style="margin-left:10px">状态：</label>

‎sysapp/dialog/papp.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//给个初始值
1313
$app = array(
1414
'icon' => 'img/ui/papp.png',
15-
'type' => 'papp',
15+
'type' => 'pwindow',
1616
'isresize' => 1,
1717
'isopenmax' => 0,
1818
'isflash' => 0
@@ -95,7 +95,7 @@
9595
<div class="input-label">
9696
<label class="label-text">应用类型：</label>
9797
<div class="label-box form-inline control-group">
98-
<label class="radio" style="margin-right:10px"><input type="radio" name="val_type" value="papp" <?php if($app['type'] == 'papp'){echo 'checked';} ?>>APP</label>
98+
<label class="radio" style="margin-right:10px"><input type="radio" name="val_type" value="pwindow" <?php if($app['type'] == 'pwindow'){echo 'checked';} ?>>APP</label>
9999
<label class="radio"><input type="radio" name="val_type" value="pwidget" <?php if($app['type'] == 'pwidget'){echo 'checked';} ?>>挂件</label>
100100
</div>
101101
</div>
@@ -162,7 +162,7 @@
162162
}
163163
});
164164
$('input[name="val_type"]').change(function(){
165-
if($(this).val() == 'papp'){
165+
if($(this).val() == 'pwindow'){
166166
$('.input-label-isresize, .input-label-isopenmax, .input-label-isflash').slideDown();
167167
}else{
168168
$('input[name="val_isresize"]').each(function(){

0 commit comments

Comments
 (0)