diff --git a/html/index.html b/html/index.html index 83268de8..f5aff6c7 100644 --- a/html/index.html +++ b/html/index.html @@ -10,7 +10,7 @@ {{ title }} - + @@ -37,14 +37,14 @@ lib = 'lib/', client = lib + 'client/', files = [ - client + 'key.js', - client + 'listeners.js', - lib + 'client.js', - client + 'notify.js', - client + 'loader.js', - client + 'dom.js', + lib + 'util.js', lib + 'cloudfunc.js', - lib + 'util.js' + client + 'dom.js', + client + 'loader.js', + client + 'notify.js', + lib + 'client.js', + client + 'listeners.js', + client + 'key.js' ], url = getJoinURL(files); diff --git a/lib/client/edit.js b/lib/client/edit.js index c7520f1e..9d8305ad 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -194,8 +194,8 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch; function diff(pNewValue, pCallBack) { var libs = [ - LIBDIR + 'diff.js', - LIBDIR + 'diff/diff-match-patch.js' + LIBDIR + 'diff/diff-match-patch.js', + LIBDIR + 'diff.js' ], url = CloudFunc.getJoinURL(libs); diff --git a/lib/server/files.js b/lib/server/files.js index 3c8f6818..01e40a9c 100644 --- a/lib/server/files.js +++ b/lib/server/files.js @@ -84,7 +84,7 @@ p.write.end(); Util.exec(p.callback); } else { - name = p.dir + p.names.pop(); + name = p.dir + p.names.shift(); pipe.create({ from : name,