Browse Source

Merge pull request #2 from remcovanvugt/cf-ng-jump-callflow

Added functionality to callflow jump (cf_callflow) node to jump to co…
pull/4/head
Remco van Vugt 8 years ago
committed by GitHub
parent
commit
c949727845
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
  1. +8
    -0
      src/apps/callflows/app.js
  2. +2
    -2
      src/apps/callflows/style/app.css
  3. +9
    -2
      src/apps/callflows/views/node.html

+ 8
- 0
src/apps/callflows/app.js View File

@ -144,6 +144,7 @@ define(function(require){
self.editCallflow({ id: callflowId });
});
callflowList.on('scroll', function() {
if(!isLoading && callflowList.data('next-key') && (callflowList.scrollTop() >= (callflowList[0].scrollHeight - callflowList.innerHeight() - 100))) {
isLoading = true;
@ -1561,6 +1562,13 @@ define(function(require){
}
});
$('.node-options .jump', layout).click(function() {
var $this = $(this),
callflowId = $this.attr('id');
self.editCallflow({ id: callflowId });
});
return layout;
},


+ 2
- 2
src/apps/callflows/style/app.css View File

@ -349,7 +349,7 @@
#ws_callflow .module {
font-size: 13px;
height: 59px;
height: 49px;
margin-top: 15px;
cursor: default;
}
@ -1740,4 +1740,4 @@
.ui-dialog-content .monster-link:not(.disabled):focus .fa {
background: transparent;
color: #22A5FF;
}
}

+ 9
- 2
src/apps/callflows/views/node.html View File

@ -5,7 +5,14 @@
<i class="fa fa-{{ callflow.icon }}"/>
<span class="module_name">{{ callflow.name }}</span>
</div>
<div class="details">{{ node.caption }}</div>
</div>
<div class="details">
{{#compare node.module "===" "callflow"}}
<div id="{{ node.data.data.id }}" class="jump"><a class="inline_action" data-action="edit" href="#">{{ node.caption }}</a></div>
</div>
{{else}}
{{ node.caption }}
{{/compare}}
</div>
<div class="clear"/>
</div>
</div>

Loading…
Cancel
Save