upgrade dependencies

ACTom · Oct 18, 2018 · edced22 · edced22
1 parent b6643a5
commit edced22
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -35,14 +35,14 @@
         "seajs": "~2.3.0"
     },
     "dependencies": {
-        "bootstrap": "~3.3.4",
+        "bootstrap": "~3.3.7",
         "angular": "~1.3.15",
-        "angular-bootstrap": "~0.12.1",
-        "angular-ui-codemirror": "~0.2.3",
-        "codemirror": "~4.8.0",
+        "angular-bootstrap": "~0.14.0",
+        "angular-ui-codemirror": "~0.3.0",
         "marked": "git://github.com/chjj/marked.git#master",
         "hotbox": "~1.0.2",
-        "color-picker": "~1.0.2"
+        "color-picker": "~1.0.9",
+        "js-base64": "~2.4.9"
     },
     "overrides": {
         "codemirror": {

diff --git a/dist/index.html b/dist/index.html
@@ -45,7 +45,6 @@
 <script src="../bower_components/angular-ui-codemirror/ui-codemirror.js"></script>
 <script src="../bower_components/marked/lib/marked.js"></script>
 <script src="../bower_components/hotbox/hotbox.js"></script>
-<script src="../bower_components/json-diff/json-diff.js"></script>
 <script src="../node_modules/kity/dist/kity.js"></script>
 <script src="../node_modules/kityminder-core/dist/kityminder.core.js"></script>
 <script src="../bower_components/color-picker/dist/color-picker.js"></script>

diff --git a/index.html b/index.html
@@ -46,7 +46,6 @@
 <script src="bower_components/marked/lib/marked.js"></script>
 <script src="node_modules/kity/dist/kity.js"></script>
 <script src="bower_components/hotbox/hotbox.js"></script>
-<script src="bower_components/json-diff/json-diff.js"></script>
 <script src="node_modules/kityminder-core/dist/kityminder.core.js"></script>
 <script src="bower_components/color-picker/dist/color-picker.js"></script>
 <script src="bower_components/seajs/dist/sea.js"></script>

diff --git a/ui/dialog/image/image.ctrl.js b/ui/dialog/image/image.ctrl.js
@@ -14,6 +14,12 @@ angular.module('kityminderEditor')
             $imageUrl[0].setSelectionRange(0, $scope.data.url.length);
         }, 300);
 
+        $modalInstance.rendered.then(function () {
+            $('#upload-image').change(function(){
+                $scope.uploadImage();
+            });
+        });
+
 
         // 搜索图片按钮点击事件
         $scope.searchImage = function() {

diff --git a/ui/dialog/image/image.tpl.html b/ui/dialog/image/image.tpl.html
@@ -35,28 +35,28 @@ <h3 class="modal-title">图片</h3>
                 </div>
                 <div class="form-group" ng-class="{'has-success' : titlePassed}">
                     <label for="image-title">提示文本：</label>
-                    <input type="text" class="form-control" ng-model="data.title" ng-blur="titlePassed = true" id="image-title" placeholder="选填：鼠标在图片上悬停时提示的文本">
+                    <input type="text" class="form-control" ng-model="data.title" ng-blur="titlePassed = true" placeholder="选填：鼠标在图片上悬停时提示的文本">
                 </div>
                 <div class="form-group">
                     <label for="image-preview">图片预览：</label>
-                    <img class="image-preview" id="image-preview" ng-src="{{ data.url }}" alt="{{ data.title }}"/>
+                    <img class="image-preview" ng-src="{{ data.url }}" alt="{{ data.title }}"/>
                 </div>
             </form>
         </tab>
         <tab heading="上传图片" active="true">
             <form>
                 <div class="form-group">
                     <!-- 这里不能用 ng-change -->
-                    <input type="file" name="upload-image" id="upload-image" class="upload-image" accept=".jpg,.JPG,jpeg,JPEG,.png,.PNG,.gif,.GIF" onchange="angular.element(this).scope().uploadImage()"/>
+                    <input type="file" name="upload-image" id="upload-image" class="upload-image" accept=".jpg,.JPG,jpeg,JPEG,.png,.PNG,.gif,.GIF" />
                     <label for="upload-image" class="btn btn-primary"><span>选择文件&hellip;</span></label>
                 </div>
                 <div class="form-group" ng-class="{'has-success' : titlePassed}">
                     <label for="image-title">提示文本：</label>
-                    <input type="text" class="form-control" ng-model="data.title" ng-blur="titlePassed = true" id="image-title" placeholder="选填：鼠标在图片上悬停时提示的文本">
+                    <input type="text" class="form-control" ng-model="data.title" ng-blur="titlePassed = true" placeholder="选填：鼠标在图片上悬停时提示的文本">
                 </div>
                 <div class="form-group">
                     <label for="image-preview">图片预览：</label>
-                    <img class="image-preview" id="image-preview" ng-src="{{ data.url }}" title="{{ data.title }}" alt="{{ data.title }}"/>
+                    <img class="image-preview" ng-src="{{ data.url }}" title="{{ data.title }}" alt="{{ data.title }}"/>
                 </div>
             </form>
         </tab>