fix Object.assign not working on some browser bug

master 0.0.3
unknown 7 years ago
parent 12c45e5a1c
commit d23dc68057

@ -222,6 +222,8 @@
</div>
</div>
</div>
<!-- polyfill make browser support ECMAScript 6th edition -->
<script src="/res/js/promise-polyfill.min.js"></script>
<script src="/res/js/jquery-3.1.0.min.js"></script>
<script src="/res/bootstrap-3.3.5/js/bootstrap.min.js"></script>
<script src="/res/js/moment.min.js"></script>

@ -1,6 +1,5 @@
/* index.js */
var W = {};
var testPrograms = [{
program: {
name: "gggg",
@ -36,12 +35,10 @@ var vm = new Vue({
});
},
showEditProgram: function(p) {
this.edit.program = Object.assign({}, p);
this.edit.program = Object.assign({}, p); // here require polyfill.min.js
$("#programEdit").modal('show');
console.log(p.name, p);
},
editProgram: function() {
console.log(this.edit.program);
var p = this.edit.program;
$.ajax({
url: "/api/programs/" + p.name,
@ -199,7 +196,6 @@ Vue.filter('colorStatus', function(value) {
default:
return makeColorText(value, "gray");
}
return value;
})
Vue.directive('disable', function(value) {
@ -230,9 +226,6 @@ $(function() {
e.preventDefault()
});
console.log("HEE")
function newEventWatcher() {
W.events = newWebsocket("/ws/events", {
onopen: function(evt) {

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save